rpms/quassel/devel quassel.spec,1.10,1.11

Rex Dieter rdieter at fedoraproject.org
Thu Jun 25 19:02:53 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/quassel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26516

Modified Files:
	quassel.spec 
Log Message:
* Thu Jun 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.1-2
- cleanup dir ownership
- optimize scriptlets



Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/quassel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- quassel.spec	25 Apr 2009 19:35:46 -0000	1.10
+++ quassel.spec	25 Jun 2009 19:02:22 -0000	1.11
@@ -1,7 +1,7 @@
 Name:    quassel
 Summary: QT4 Based distrubuted IRC system
 Version: 0.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
@@ -18,9 +18,6 @@ BuildRequires: qt-devel, openssl-devel, 
 BuildRequires: cmake, kde-filesystem
 BuildRequires: desktop-file-utils
 
-Requires(post):	/sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
-
 %description
 Quassel IRC is a modern, distributed IRC client, 
 meaning that one (or multiple) client(s) can attach 
@@ -62,49 +59,37 @@ make install DESTDIR=${RPM_BUILD_ROOT} 
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
+%post client
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%postun client
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans client
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
 
 %files 
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quassel
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_kde4_appsdir}/quassel/icons/hicolor/128x128/apps/quassel.png                                                                                                           
-%{_kde4_appsdir}/quassel/icons/hicolor/16x16/apps/quassel.png                                                                                                             
-%{_kde4_appsdir}/quassel/icons/hicolor/22x22/apps/quassel.png                                                                                                             
-%{_kde4_appsdir}/quassel/icons/hicolor/32x32/apps/quassel.png                                                                                                             
-%{_kde4_appsdir}/quassel/icons/hicolor/48x48/apps/quassel.png                                                                                                             
-%{_kde4_appsdir}/quassel/icons/hicolor/64x64/apps/quassel.png                                                                                                             
-%{_kde4_appsdir}/quassel/icons/oxygen/128x128/animations/*                                                                                         
-%{_kde4_appsdir}/quassel/icons/oxygen/128x128/apps/*                                                                                                            
-%{_kde4_appsdir}/quassel/icons/oxygen/16x16/actions/*                                                                                                  
-%{_kde4_appsdir}/quassel/icons/oxygen/16x16/animations/*                                                                                           
-%{_kde4_appsdir}/quassel/icons/oxygen/16x16/apps/*                                                                                                              
-%{_kde4_appsdir}/quassel/icons/oxygen/16x16/devices/*                                                                                                     
-%{_kde4_appsdir}/quassel/icons/oxygen/16x16/status/*                                                                                                 
-%{_kde4_appsdir}/quassel/icons/oxygen/22x22/actions/*                                                                                                     
-%{_kde4_appsdir}/quassel/icons/oxygen/22x22/animations/*                                                                                           
-%{_kde4_appsdir}/quassel/icons/oxygen/22x22/apps/*
-%{_kde4_appsdir}/quassel/icons/oxygen/22x22/status/*
-%{_kde4_appsdir}/quassel/icons/oxygen/32x32/animations/*
-%{_kde4_appsdir}/quassel/icons/oxygen/32x32/apps/*
-%{_kde4_appsdir}/quassel/icons/oxygen/48x48/animations/*
-%{_kde4_appsdir}/quassel/icons/oxygen/48x48/apps/*
-%{_kde4_appsdir}/quassel/icons/oxygen/48x48/status/*
-%{_kde4_appsdir}/quassel/icons/oxygen/64x64/animations/*
-%{_kde4_appsdir}/quassel/icons/oxygen/64x64/apps/*
-%{_kde4_appsdir}/quassel/icons/oxygen/*
-%{_kde4_appsdir}/quassel/icons/oxygen/scalable/actions/*
-%{_kde4_appsdir}/quassel/icons/oxygen/scalable/apps/*
-%{_kde4_appsdir}/quassel/icons/oxygen/scalable/devices/*
-%{_kde4_appsdir}/quassel/icons/oxygen/scalable/status/*
-%{_kde4_appsdir}/quassel/*
-%{_kde4_appsdir}/quassel/translations/*
+%{_kde4_appsdir}/quassel/
 /usr/share/icons/hicolor/48x48/apps/quassel.png
+# pixmaps dir is deprecated, not needed anymore -- Rex
 /usr/share/pixmaps/quassel.png
 %{_kde4_datadir}/applications/kde4/quassel.desktop
 
@@ -117,42 +102,16 @@ xdg-icon-resource forceupdate --theme hi
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quasselclient
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_kde4_appsdir}/quassel/icons/hicolor/128x128/apps/quassel.png                                                                                                           
-%{_kde4_appsdir}/quassel/icons/hicolor/16x16/apps/quassel.png                                                                                                             
-%{_kde4_appsdir}/quassel/icons/hicolor/22x22/apps/quassel.png                                                                                                             
-%{_kde4_appsdir}/quassel/icons/hicolor/32x32/apps/quassel.png                                                                                                             
-%{_kde4_appsdir}/quassel/icons/hicolor/48x48/apps/quassel.png                                                                                                             
-%{_kde4_appsdir}/quassel/icons/hicolor/64x64/apps/quassel.png                                                                                                             
-%{_kde4_appsdir}/quassel/icons/oxygen/128x128/animations/*                                                                                         
-%{_kde4_appsdir}/quassel/icons/oxygen/128x128/apps/*                                                                                                            
-%{_kde4_appsdir}/quassel/icons/oxygen/16x16/actions/*                                                                                                  
-%{_kde4_appsdir}/quassel/icons/oxygen/16x16/animations/*                                                                                           
-%{_kde4_appsdir}/quassel/icons/oxygen/16x16/apps/*                                                                                                              
-%{_kde4_appsdir}/quassel/icons/oxygen/16x16/devices/*                                                                                                     
-%{_kde4_appsdir}/quassel/icons/oxygen/16x16/status/*                                                                                                 
-%{_kde4_appsdir}/quassel/icons/oxygen/22x22/actions/*                                                                                                     
-%{_kde4_appsdir}/quassel/icons/oxygen/22x22/animations/*                                                                                           
-%{_kde4_appsdir}/quassel/icons/oxygen/22x22/apps/*
-%{_kde4_appsdir}/quassel/icons/oxygen/22x22/status/*
-%{_kde4_appsdir}/quassel/icons/oxygen/32x32/animations/*
-%{_kde4_appsdir}/quassel/icons/oxygen/32x32/apps/*
-%{_kde4_appsdir}/quassel/icons/oxygen/48x48/animations/*
-%{_kde4_appsdir}/quassel/icons/oxygen/48x48/apps/*
-%{_kde4_appsdir}/quassel/icons/oxygen/48x48/status/*
-%{_kde4_appsdir}/quassel/icons/oxygen/64x64/animations/*
-%{_kde4_appsdir}/quassel/icons/oxygen/64x64/apps/*
-%{_kde4_appsdir}/quassel/icons/oxygen/*
-%{_kde4_appsdir}/quassel/icons/oxygen/scalable/actions/*
-%{_kde4_appsdir}/quassel/icons/oxygen/scalable/apps/*
-%{_kde4_appsdir}/quassel/icons/oxygen/scalable/devices/*
-%{_kde4_appsdir}/quassel/icons/oxygen/scalable/status/*
-%{_kde4_appsdir}/quassel/*
-%{_kde4_appsdir}/quassel/translations/*
+%{_kde4_appsdir}/quassel/
 /usr/share/icons/hicolor/48x48/apps/quassel.png
 /usr/share/pixmaps/quassel.png
 %{_kde4_datadir}/applications/kde4/quasselclient.desktop
 
 %changelog
+* Thu Jun 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.1-2
+- cleanup dir ownership
+- optimize scriptlets
+
 * Fri Apr 24 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.1-1
 - New upstream release
 




More information about the fedora-extras-commits mailing list