rpms/kdeutils/F-10 .cvsignore, 1.56, 1.57 kdeutils.spec, 1.153, 1.154 sources, 1.60, 1.61
Rex Dieter
rdieter at fedoraproject.org
Thu Apr 2 15:31:32 UTC 2009
- Previous message: rpms/awn-extras-applets/devel awn-extras-applets.spec,1.17,1.18
- Next message: rpms/ocaml-mlgmpidl/F-9 mlgmpidl-1.1-Makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 ocaml-mlgmpidl.spec, 1.1, 1.2 sources, 1.2, 1.3 mlgmpidl-1.0-Makefile.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdeutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6023
Modified Files:
.cvsignore kdeutils.spec sources
Log Message:
sync w/devel for 4.2.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore 6 Mar 2009 15:18:14 -0000 1.56
+++ .cvsignore 2 Apr 2009 15:31:02 -0000 1.57
@@ -1 +1 @@
-kdeutils-4.2.1.tar.bz2
+kdeutils-4.2.2.tar.bz2
Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/kdeutils.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kdeutils.spec 6 Mar 2009 16:23:39 -0000 1.153
+++ kdeutils.spec 2 Apr 2009 15:31:02 -0000 1.154
@@ -1,17 +1,12 @@
-%if 0%{?fedora} > 9
-# include new PyKDE4 printer applet
-%define printer_applet 1
-%endif
-
%if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
+# continue including kjots here (as in 4.0) for F9 (we don't have kdepim4 there)
%define include_kjots 1
%endif
Name: kdeutils
Epoch: 6
-Version: 4.2.1
-Release: 3%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
Summary: K Desktop Environment - Utilities
Group: Applications/System
@@ -33,15 +28,15 @@
BuildRequires: libzip-devel
BuildRequires: qimageblitz-devel
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
Requires: kdelibs4 >= %{version}
-%if 0%{?printer_applet}
+
+# printer applet
BuildRequires: PyKDE4-devel >= %{version}
BuildRequires: system-config-printer-libs
# upgrade path so it doesn't get lost
Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
-%endif
Provides: okteta = 0.1.0-1
Obsoletes: okteta < 0.1.0-1
@@ -125,16 +120,24 @@
%post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+update-desktop-database -q &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
%postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+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
%files
@@ -184,16 +187,26 @@
%endif
%{_mandir}/man1/*
-%if 0%{?printer_applet}
%files printer-applet
%defattr(-,root,root,-)
%{_kde4_bindir}/printer-applet
%{_kde4_datadir}/autostart/printer-applet.desktop
%{_kde4_appsdir}/printer-applet/
-%endif
%changelog
+* 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
+
+* Sat Mar 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-3.2
+- also drag in the printer-applet on F9
+
+* Sat Mar 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-3.1
+- also build printer-applet on F9, but don't drag it in by default
+
* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-3
- *really* make a -printer-applet subpkg
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources 27 Feb 2009 18:53:34 -0000 1.60
+++ sources 2 Apr 2009 15:31:02 -0000 1.61
@@ -1 +1 @@
-ed3397244a64530c108e76d6767c07d0 kdeutils-4.2.1.tar.bz2
+3df5186f9dacddbce48a1c7eb35515cd kdeutils-4.2.2.tar.bz2
- Previous message: rpms/awn-extras-applets/devel awn-extras-applets.spec,1.17,1.18
- Next message: rpms/ocaml-mlgmpidl/F-9 mlgmpidl-1.1-Makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 ocaml-mlgmpidl.spec, 1.1, 1.2 sources, 1.2, 1.3 mlgmpidl-1.0-Makefile.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list