[libgnome] Simplify the schemalist

paragn paragn at fedoraproject.org
Wed Oct 27 08:28:06 UTC 2010


commit 7759a9659ad22b78ee9a3778c4088f05c6a33d75
Author: paragn <paragn at fedoraproject.org>
Date:   Wed Oct 27 13:57:39 2010 +0530

    Simplify the schemalist

 libgnome.spec |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)
---
diff --git a/libgnome.spec b/libgnome.spec
index b49bc30..bb05e18 100644
--- a/libgnome.spec
+++ b/libgnome.spec
@@ -1,6 +1,27 @@
-%define _default_patch_fuzz 2
-
-%define po_package libgnome-2.0
+%global _default_patch_fuzz 2
+
+%global po_package libgnome-2.0
+
+%global schemalist \\\
+	desktop_gnome_accessibility_keyboard \\\
+	desktop_gnome_accessibility_startup \\\
+	desktop_gnome_applications_at_mobility \\\
+	desktop_gnome_applications_at_visual \\\
+	desktop_gnome_applications_browser \\\
+	desktop_gnome_applications_office \\\
+	desktop_gnome_applications_terminal  \\\
+	desktop_gnome_applications_window_manager \\\
+	desktop_gnome_background \\\
+	desktop_gnome_file_views \\\
+	desktop_gnome_interface \\\
+	desktop_gnome_lockdown \\\
+	desktop_gnome_peripherals_keyboard \\\
+	desktop_gnome_peripherals_monitor \\\
+	desktop_gnome_peripherals_mouse \\\
+	desktop_gnome_sound \\\
+	desktop_gnome_thumbnail_cache \\\
+	desktop_gnome_thumbnailers \\\
+	desktop_gnome_typing_break
 
 Summary: GNOME base library
 Name: libgnome
@@ -121,15 +142,13 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 %post
 /sbin/ldconfig
-%gconf_schema_upgrade desktop_gnome_accessibility_keyboard desktop_gnome_accessibility_startup desktop_gnome_applications_at_mobility desktop_gnome_applications_at_visual desktop_gnome_applications_browser desktop_gnome_applications_office desktop_gnome_applications_terminal desktop_gnome_applications_window_manager desktop_gnome_background desktop_gnome_file_views desktop_gnome_interface desktop_gnome_lockdown desktop_gnome_peripherals_keyboard desktop_gnome_peripherals_monitor desktop_gnome_peripherals_mouse desktop_gnome_sound desktop_gnome_thumbnail_cache desktop_gnome_thumbnailers desktop_gnome_typing_break
+%gconf_schema_upgrade %{schemalist}
 
 %pre
-%gconf_schema_prepare desktop_gnome_accessibility_keyboard desktop_gnome_accessibility_startup desktop_gnome_applications_at_mobility desktop_gnome_applications_at_visual desktop_gnome_applications_browser desktop_gnome_applications_office desktop_gnome_applications_terminal desktop_gnome_applications_window_manager desktop_gnome_background desktop_gnome_file_views desktop_gnome_interface desktop_gnome_lockdown desktop_gnome_peripherals_keyboard desktop_gnome_peripherals_monitor desktop_gnome_peripherals_mouse desktop_gnome_sound desktop_gnome_thumbnail_cache desktop_gnome_thumbnailers desktop_gnome_typing_break
-
+%gconf_schema_prepare %{schemalist}
 
 %preun
-%gconf_schema_remove desktop_gnome_accessibility_keyboard desktop_gnome_accessibility_startup desktop_gnome_applications_at_mobility desktop_gnome_applications_at_visual desktop_gnome_applications_browser desktop_gnome_applications_office desktop_gnome_applications_terminal desktop_gnome_applications_window_manager desktop_gnome_background desktop_gnome_file_views desktop_gnome_interface desktop_gnome_lockdown desktop_gnome_peripherals_keyboard desktop_gnome_peripherals_monitor desktop_gnome_peripherals_mouse desktop_gnome_sound desktop_gnome_thumbnail_cache desktop_gnome_thumbnailers desktop_gnome_typing_break
-
+%gconf_schema_remove %{schemalist}
 
 %postun -p /sbin/ldconfig
 
@@ -156,6 +175,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
 %changelog
 * Wed Oct 27 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.32.0-3
 - Write the schema names explicitly instead to use wildcard character
+- Simplify the schemalist, suggested by Yanko Kaneti
+- Guidelines says %%global preferred over %%define
 
 * Fri Oct 15 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.32.0-2
 - Merge-review cleanup (#226018)


More information about the scm-commits mailing list