SPECS: gtk+2.spec - package im-multipress.conf properly - some dir...

[qboosh]

Author: qboosh                       Date: Tue Sep 18 16:29:41 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package im-multipress.conf properly
- some dir globbing consistency

---- Files affected:
SPECS:
   gtk+2.spec (1.251 -> 1.252) 

---- Diffs:

================================================================
Index: SPECS/gtk+2.spec
diff -u SPECS/gtk+2.spec:1.251 SPECS/gtk+2.spec:1.252
--- SPECS/gtk+2.spec:1.251	Fri Sep 14 17:02:20 2007
+++ SPECS/gtk+2.spec	Tue Sep 18 18:29:36 2007
@@ -205,7 +205,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}/gtk-2.0} \
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{abivers}/filesystems
 
 %{__make} install \
@@ -221,10 +221,10 @@
 # remove unsupported locale scheme
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/en at IPA
 # shut up check-files (static modules and *.la for modules)
-rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-*/2.*/*/*.{a,la}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{abivers}/*/*.{a,la}
 
 # for various GTK+2 modules
-install -d $(echo $RPM_BUILD_ROOT%{_libdir}/gtk-*)/modules
+install -d $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/az_IR
 
@@ -264,22 +264,26 @@
 %attr(755,root,root) %{_bindir}/gdk-pixbuf-query-loaders
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
-%dir %{_libdir}/gtk-*
-%dir %{_libdir}/gtk-*/modules
-%dir %{_libdir}/gtk-*/%{abivers}
-%dir %{_libdir}/gtk-*/%{abivers}/engines
-%dir %{_libdir}/gtk-*/%{abivers}/filesystems
-%dir %{_libdir}/gtk-*/%{abivers}/immodules
-%dir %{_libdir}/gtk-*/%{abivers}/loaders
-%dir %{_libdir}/gtk-*/%{abivers}/printbackends
-%attr(755,root,root) %{_libdir}/gtk-*/%{abivers}/engines/libpixmap.so
-%attr(755,root,root) %{_libdir}/gtk-*/%{abivers}/immodules/*.so
-%attr(755,root,root) %{_libdir}/gtk-*/%{abivers}/loaders/*.so
-%attr(755,root,root) %{_libdir}/gtk-*/%{abivers}/printbackends/*.so
-
-%{_datadir}/gtk-*
-%dir %{_sysconfdir}/gtk-*
-%ghost %{_sysconfdir}/gtk-*/*
+%dir %{_libdir}/gtk-2
+%dir %{_libdir}/gtk-2/modules
+%dir %{_libdir}/gtk-2/%{abivers}
+%dir %{_libdir}/gtk-2/%{abivers}/engines
+%dir %{_libdir}/gtk-2/%{abivers}/filesystems
+%dir %{_libdir}/gtk-2/%{abivers}/immodules
+%dir %{_libdir}/gtk-2/%{abivers}/loaders
+%dir %{_libdir}/gtk-2/%{abivers}/printbackends
+%attr(755,root,root) %{_libdir}/gtk-2/%{abivers}/engines/libpixmap.so
+%attr(755,root,root) %{_libdir}/gtk-2/%{abivers}/immodules/*.so
+%attr(755,root,root) %{_libdir}/gtk-2/%{abivers}/loaders/*.so
+%attr(755,root,root) %{_libdir}/gtk-2/%{abivers}/printbackends/*.so
+
+# XXX: just demo data - move to examples?
+%{_datadir}/gtk-2
+
+%dir %{_sysconfdir}/gtk-2
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gtk-2/im-multipress.conf
+%ghost %{_sysconfdir}/gtk-2/gdk-pixbuf.loaders
+%ghost %{_sysconfdir}/gtk-2/gtk.immodules
 %dir %{_datadir}/themes/Default/gtk-*
 %{_datadir}/themes/Default/gtk-*/gtkrc
 %dir %{_datadir}/themes/Emacs
@@ -298,7 +302,7 @@
 %{_libdir}/lib*.la
 %{_includedir}/*
 %{_aclocaldir}/*.m4
-%{_libdir}/gtk-*/include
+%{_libdir}/gtk-2/include
 %{_pkgconfigdir}/*.pc
 %{_mandir}/man1/*
 
@@ -324,6 +328,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.252  2007/09/18 16:29:36  qboosh
+- package im-multipress.conf properly
+- some dir globbing consistency
+
 Revision 1.251  2007/09/14 15:02:20  megabajt
 - updated to 2.12.0; merged from DEVEL
 - removed obsolete cups-1.3 patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gtk+2.spec?r1=1.251&r2=1.252&f=u