SPECS: emerald.spec - used %update_mime_database and %update_icon_...

megabajt megabajt at pld-linux.org
Sat Feb 17 21:53:45 CET 2007


Author: megabajt                     Date: Sat Feb 17 20:53:45 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- used %update_mime_database and %update_icon_cache macros
- removed obsolete GNOME mime-info stuff

---- Files affected:
SPECS:
   emerald.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/emerald.spec
diff -u SPECS/emerald.spec:1.19 SPECS/emerald.spec:1.20
--- SPECS/emerald.spec:1.19	Wed Feb 14 21:53:17 2007
+++ SPECS/emerald.spec	Sat Feb 17 21:53:40 2007
@@ -19,7 +19,11 @@
 BuildRequires:	libwnck-devel >= 2.14.1-2
 BuildRequires:	pango-devel >= 1.10.0
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	xorg-lib-libXrender-devel >= 0.8.4
+Requires(post,postun):	gtk+2
+Requires(post,postun):	hicolor-icon-theme
+Requires(post,postun):	shared-mime-info
 Requires:	beryl-core >= 1:%{version}
 Obsoletes:	cgwd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -124,14 +128,23 @@
         DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/engines/*.{la,a}
+# obsoleted GNOME mime-info stuff
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post
+/sbin/ldconfig
+%update_mime_database
+%update_icon_cache hicolor
+
+%postun
+/sbin/ldconfig
+%update_mime_database
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -142,7 +155,6 @@
 %dir %{_libdir}/%{name}/engines
 %attr(755,root,root) %{_libdir}/%{name}/engines/*.so
 %{_datadir}/%{name}
-%{_datadir}/mime-info/emerald.mime
 %{_datadir}/mime/packages/emerald.xml
 %{_desktopdir}/emerald-theme-manager.desktop
 %{_pixmapsdir}/emerald-theme-manager-icon.png
@@ -167,6 +179,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2007/02/17 20:53:40  megabajt
+- used %update_mime_database and %update_icon_cache macros
+- removed obsolete GNOME mime-info stuff
+
 Revision 1.19  2007/02/14 20:53:17  rotom
 - up to 0.1.9999.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/emerald.spec?r1=1.19&r2=1.20&f=u



More information about the pld-cvs-commit mailing list