rpms/kdenetwork/F-9 .cvsignore, 1.54, 1.55 kdenetwork.spec, 1.163, 1.164 sources, 1.63, 1.64
Rex Dieter
rdieter at fedoraproject.org
Thu Apr 2 15:07:53 UTC 2009
- Previous message: rpms/kdemultimedia/F-10 .cvsignore, 1.58, 1.59 kdemultimedia.spec, 1.129, 1.130 sources, 1.61, 1.62
- Next message: rpms/kdenetwork/F-10 .cvsignore, 1.60, 1.61 kdenetwork.spec, 1.164, 1.165 sources, 1.69, 1.70
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdenetwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29895/F-9
Modified Files:
.cvsignore kdenetwork.spec sources
Log Message:
sync w/devel for 4.2.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore 9 Jan 2009 10:38:39 -0000 1.54
+++ .cvsignore 2 Apr 2009 15:07:22 -0000 1.55
@@ -1 +1 @@
-kdenetwork-4.1.4.tar.bz2
+kdenetwork-4.2.2.tar.bz2
Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- kdenetwork.spec 27 Feb 2009 18:01:22 -0000 1.163
+++ kdenetwork.spec 2 Apr 2009 15:07:22 -0000 1.164
@@ -1,7 +1,7 @@
Summary: K Desktop Environment - Network Applications
Name: kdenetwork
Epoch: 7
-Version: 4.2.1
+Version: 4.2.2
Release: 1%{?dist}
License: GPLv2
@@ -46,9 +46,6 @@
BuildRequires: libv4l-devel
# FIXME/TODO: libnxcl-devel
-# FIXME/TODO: are there other explicit Requires?
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
Requires: kdepimlibs >= %{version}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
@@ -95,9 +92,9 @@
%patch0 -p1 -b .handle-enc-message
%patch1 -p1 -b .libv4l
%patch100 -p0 -b .system-libgadu
+rm -rf kopete/protocols/gadu/libgadu/
%patch104 -p1 -b .kopete-view-history
-rm -rf kopete/protocols/gadu/libgadu/
%build
mkdir -p %{_target_platform}
@@ -105,7 +102,7 @@
%{cmake_kde4} ..
popd
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
%install
@@ -119,14 +116,23 @@
%post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
%postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+ update-desktop-database -q &> /dev/null ||:
+fi
+
%post libs -p /sbin/ldconfig
@@ -157,10 +163,10 @@
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_libdir}/kde4/*
-%{_kde4_libdir}/libqgroupwise.so
%files libs
%defattr(-,root,root,-)
+%{_kde4_libdir}/libqgroupwise.so
%{_kde4_libdir}/lib*.so.*
%files devel
@@ -171,7 +177,13 @@
%changelog
-* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
- 4.2.1
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.0-9
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources 27 Feb 2009 18:01:23 -0000 1.63
+++ sources 2 Apr 2009 15:07:22 -0000 1.64
@@ -1 +1 @@
-17ba9800af0bfcf20a49337624f9946a kdenetwork-4.2.1.tar.bz2
+72193b5eb050ef45fad76422a15e0e1a kdenetwork-4.2.2.tar.bz2
- Previous message: rpms/kdemultimedia/F-10 .cvsignore, 1.58, 1.59 kdemultimedia.spec, 1.129, 1.130 sources, 1.61, 1.62
- Next message: rpms/kdenetwork/F-10 .cvsignore, 1.60, 1.61 kdenetwork.spec, 1.164, 1.165 sources, 1.69, 1.70
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list