[libmate] move unversioned .so to main package

leigh123linux leigh123linux at fedoraproject.org
Wed Oct 17 14:57:28 UTC 2012


commit 36df4f81505ade38631cf5875bcb571491b93338
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Oct 17 15:57:24 2012 +0100

    move unversioned .so to main package
    
    - clean up spec file and scriptlets

 libmate.spec |   95 +++++++++++++++++----------------------------------------
 1 files changed, 29 insertions(+), 66 deletions(-)
---
diff --git a/libmate.spec b/libmate.spec
index e7a2a59..753c5ca 100644
--- a/libmate.spec
+++ b/libmate.spec
@@ -1,7 +1,13 @@
+%global  schemas desktop_mate_accessibility_keyboard desktop_mate_accessibility_startup desktop_mate_applications_at_mobility \
+desktop_mate_aplications_at_visual desktop_mate_applications_browser desktop_mate_applications_office \
+desktop_mate_applications_terminal desktop_mate_applications_window_manager desktop_mate_background desktop_mate_file_views \
+desktop_mate_interface desktop_mate_lockdown desktop_mate_peripherals_keyboard desktop_mate_peripherals_mouse desktop_mate_sound \
+desktop_mate_thumbnail_cache desktop_mate_thumbnailers desktop_mate_typingbreak
+ 
 Summary:	MATE Desktop base libraries
 Name:	libmate
 Version:	1.4.0
-Release:	13%{?dist}
+Release:	14%{?dist}
 URL:		http://mate-desktop.org
 Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
 License:	GPLv2+ and LGPLv2+
@@ -31,80 +37,33 @@ NOCONFIGURE=1 ./autogen.sh
 %configure -disable-static --disable-schemas-install --disable-esd
 make %{?_smp_mflags} V=1
 
+
+%install
+export MATECONF_DISABLE_MAKE_FILE_SCHEMA INSTALL=1
+make LIBTOOL="/usr/bin/libtool" DESTDIR=%{buildroot} install
+
+find %{buildroot} -name '*.la' -exec rm -rf {} ';'
+find %{buildroot} -name '*.a' -exec rm -rf {} ';'
+
+%find_lang %{name}
+
+
 %pre
-%mateconf_schema_prepare desktop_mate_accessibility_keyboard
-%mateconf_schema_prepare desktop_mate_accessibility_startup
-%mateconf_schema_prepare desktop_mate_applications_at_mobility
-%mateconf_schema_prepare desktop_mate_aplications_at_visual
-%mateconf_schema_prepare desktop_mate_applications_browser
-%mateconf_schema_prepare desktop_mate_applications_office
-%mateconf_schema_prepare desktop_mate_applications_office
-%mateconf_schema_prepare desktop_mate_applications_terminal
-%mateconf_schema_prepare desktop_mate_applications_window_manager
-%mateconf_schema_prepare desktop_mate_background
-%mateconf_schema_prepare desktop_mate_background
-%mateconf_schema_prepare desktop_mate_file_views
-%mateconf_schema_prepare desktop_mate_interface
-%mateconf_schema_prepare desktop_mate_lockdown
-%mateconf_schema_prepare desktop_mate_peripherals_keyboard
-%mateconf_schema_prepare desktop_mate_peripherals_mouse
-%mateconf_schema_prepare desktop_mate_sound
-%mateconf_schema_prepare desktop_mate_thumbnail_cache
-%mateconf_schema_prepare desktop_mate_thumbnailers
-%mateconf_schema_prepare desktop_mate_typingbreak
+%mateconf_schema_prepare %{schemas}
+
 
 %preun
-%mateconf_schema_remove desktop_mate_accessibility_keyboard
-%mateconf_schema_remove desktop_mate_accessibility_startup
-%mateconf_schema_remove desktop_mate_applications_at_mobility
-%mateconf_schema_remove desktop_mate_aplications_at_visual
-%mateconf_schema_remove desktop_mate_applications_browser
-%mateconf_schema_remove desktop_mate_applications_office
-%mateconf_schema_remove desktop_mate_applications_office
-%mateconf_schema_remove desktop_mate_applications_terminal
-%mateconf_schema_remove desktop_mate_applications_window_manager
-%mateconf_schema_remove desktop_mate_background
-%mateconf_schema_remove desktop_mate_background
-%mateconf_schema_remove desktop_mate_file_views
-%mateconf_schema_remove desktop_mate_interface
-%mateconf_schema_remove desktop_mate_lockdown
-%mateconf_schema_remove desktop_mate_peripherals_keyboard
-%mateconf_schema_remove desktop_mate_peripherals_mouse
-%mateconf_schema_remove desktop_mate_sound
-%mateconf_schema_remove desktop_mate_thumbnail_cache
-%mateconf_schema_remove desktop_mate_thumbnailers
-%mateconf_schema_remove desktop_mate_typingbreak
+%mateconf_schema_remove %{schemas}
+
 
 %post
 /sbin/ldconfig
-%mateconf_schema_upgrade desktop_mate_accessibility_keyboard
-%mateconf_schema_upgrade desktop_mate_accessibility_startup
-%mateconf_schema_upgrade desktop_mate_applications_at_mobility
-%mateconf_schema_upgrade desktop_mate_applications_browser
-%mateconf_schema_upgrade desktop_mate_applications_office
-%mateconf_schema_upgrade desktop_mate_applications_office
-%mateconf_schema_upgrade desktop_mate_applications_terminal
-%mateconf_schema_upgrade desktop_mate_applications_window_manager
-%mateconf_schema_upgrade desktop_mate_background
-%mateconf_schema_upgrade desktop_mate_background
-%mateconf_schema_upgrade desktop_mate_file_views
-%mateconf_schema_upgrade desktop_mate_interface
-%mateconf_schema_upgrade desktop_mate_lockdown
-%mateconf_schema_upgrade desktop_mate_peripherals_keyboard
-%mateconf_schema_upgrade desktop_mate_peripherals_mouse
-%mateconf_schema_upgrade desktop_mate_sound
-%mateconf_schema_upgrade desktop_mate_thumbnail_cache
-%mateconf_schema_upgrade desktop_mate_thumbnailers
+%mateconf_schema_upgrade %{schemas}
+
 
 %postun
 /sbin/ldconfig
 
-%install
-export MATECONF_DISABLE_MAKE_FILE_SCHEMA INSTALL=1
-make LIBTOOL="/usr/bin/libtool" DESTDIR=%{buildroot} install
-%find_lang %{name}
-find %{buildroot} -name '*.la' -exec rm -rf {} ';'
-find %{buildroot} -name '*.a' -exec rm -rf {} ';'
 
 %files -f %{name}.lang
 %doc AUTHORS README
@@ -134,15 +93,19 @@ find %{buildroot} -name '*.a' -exec rm -rf {} ';'
 %{_libdir}/libmate-2.so.0.400.0
 %{_libdir}/libmate-2.so.0
 %{_libdir}/matecomponent/servers/MATE_Moniker_std.server
+%{_libdir}/matecomponent/monikers/libmoniker_extra_2.so
 
 %files devel
 %{_datadir}/gtk-doc/html/libmate/
 %{_includedir}/libmate-2.0/
 %{_libdir}/libmate-2.so
 %{_libdir}/pkgconfig/libmate-2.0.pc
-%{_libdir}/matecomponent/monikers/libmoniker_extra_2.so
 
 %changelog
+* Wed Oct 17 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-14
+- move unversioned .so to main package
+- clean up spec file and scriptlets
+
 * Sun Sep 30 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-13
 - Update requires for devel package
 


More information about the scm-commits mailing list