rpms/kdenetwork/F-11 .cvsignore, 1.69, 1.70 kdenetwork.spec, 1.194, 1.195 sources, 1.76, 1.77 kdenetwork-4.3.1-kde#162493.patch, 1.1, NONE
Lukas Tinkl
ltinkl at fedoraproject.org
Wed Oct 7 11:32:27 UTC 2009
- Previous message: rpms/kdenetwork/F-10 .cvsignore, 1.65, 1.66 kdenetwork.spec, 1.176, 1.177 sources, 1.75, 1.76 kdenetwork-4.3.1-kde#162493.patch, 1.1, NONE
- Next message: rpms/kdenetwork/F-12 .cvsignore, 1.73, 1.74 kdenetwork.spec, 1.201, 1.202 sources, 1.79, 1.80 kdenetwork-4.3.1-kde#162493.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ltinkl
Update of /cvs/extras/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20947/F-11
Modified Files:
.cvsignore kdenetwork.spec sources
Removed Files:
kdenetwork-4.3.1-kde#162493.patch
Log Message:
KDE 4.3.2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore 1 Sep 2009 17:52:31 -0000 1.69
+++ .cvsignore 7 Oct 2009 11:32:25 -0000 1.70
@@ -1,2 +1,2 @@
krdc-icons.tar.bz2
-kdenetwork-4.3.1.tar.bz2
+kdenetwork-4.3.2.tar.bz2
Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/kdenetwork.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- kdenetwork.spec 14 Sep 2009 14:57:29 -0000 1.194
+++ kdenetwork.spec 7 Oct 2009 11:32:25 -0000 1.195
@@ -1,8 +1,8 @@
Summary: K Desktop Environment - Network Applications
Name: kdenetwork
Epoch: 7
-Version: 4.3.1
-Release: 2%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
@@ -14,9 +14,6 @@ Source1: krdc-icons.tar.bz2
Patch1: kdenetwork-4.2.98-kdrc-icon.patch
# upstream patches (4.3 branch):
-Patch100: kdenetwork-4.3.0-fix-bonjour.patch
-# http://bugs.kde.org/162493
-Patch101: kdenetwork-4.3.1-kde#162493.patch
# upstream patches (4.4 branch):
Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -50,10 +47,13 @@ BuildRequires: soprano-devel >= 2.0.97
BuildRequires: speex-devel
BuildRequires: sqlite-devel
BuildRequires: libv4l-devel
+%if 0%{?fedora}
+BuildRequires: webkitpart-devel
+%endif
# FIXME/TODO: libnxcl-devel
-Requires: kdepimlibs >= %{version}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: kdepimlibs%{?_isa} >= %{version}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: mozilla-filesystem
# kopete/yahoo
@@ -88,7 +88,7 @@ Group: System Environment/Libraries
%package devel
Group: Development/Libraries
Summary: Development files for %{name}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: kdelibs4-devel
%description devel
%{summary}.
@@ -97,8 +97,6 @@ Requires: kdelibs4-devel
%prep
%setup -q -a 1
%patch1 -p1 -b .icon
-%patch100 -p0 -b .bonjour
-%patch101 -p4 -b .kde#162493.patch
# 4.3 upstream patches
chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
@@ -145,7 +143,6 @@ if [ $1 -eq 0 ] ; then
update-desktop-database -q &> /dev/null ||:
fi
-
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -158,6 +155,7 @@ fi
%{_kde4_appsdir}/kconf_update/*
%{_kde4_appsdir}/kget/
%{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
+%{_kde4_appsdir}/webkitpart/kpartplugins/kget_plug_in.rc
%{_kde4_appsdir}/kopete*
%{_kde4_appsdir}/kppp/
%{_kde4_appsdir}/krfb/
@@ -191,6 +189,13 @@ fi
%changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Sun Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- %%?_isa'ize -libs deps
+- BR: webkitpart-devel
+
* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- kopete/bonjour patch
- krfb produces garbled display (#523131, kde#162493)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources 1 Sep 2009 17:52:31 -0000 1.76
+++ sources 7 Oct 2009 11:32:25 -0000 1.77
@@ -1,2 +1,2 @@
7dd360a790100c952090410c2c89937c krdc-icons.tar.bz2
-496000ae85856da0c6fb0e014d03d0d7 kdenetwork-4.3.1.tar.bz2
+57b44a9b59c35366a0c287c591bb9bdc kdenetwork-4.3.2.tar.bz2
--- kdenetwork-4.3.1-kde#162493.patch DELETED ---
- Previous message: rpms/kdenetwork/F-10 .cvsignore, 1.65, 1.66 kdenetwork.spec, 1.176, 1.177 sources, 1.75, 1.76 kdenetwork-4.3.1-kde#162493.patch, 1.1, NONE
- Next message: rpms/kdenetwork/F-12 .cvsignore, 1.73, 1.74 kdenetwork.spec, 1.201, 1.202 sources, 1.79, 1.80 kdenetwork-4.3.1-kde#162493.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list