- new style macros

- STBR

Changed files:
    control-center.spec -> 1.168

diff --git a/control-center.spec b/control-center.spec
index 4bd1445ac3d763682c048e667b362d21990cec2a..ef831175f9fc6747dcd71a2714c4f41a8bf64784 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -48,7 +48,7 @@ BuildRequires:        libxklavier-devel >= 2.0
 BuildRequires: libtool
 BuildRequires: metacity-devel >= 2:2.10.0
 BuildRequires: nautilus-devel >= 2.10.0-3
-BuildRequires: rpmbuild(macros) >= 1.196
+BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: xft-devel >= 2.1.1
 Requires(post,postun): /sbin/ldconfig
 Requires(post,preun):  GConf2
@@ -135,8 +135,8 @@ Statyczne biblioteki GNOME Control-Center.
 %patch9 -p1
 
 %build
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
@@ -167,34 +167,28 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -rf $RPM_BUILD_ROOT
 
 %post
-umask 022
-/sbin/ldconfig
-%gconf_schema_install /etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
-%gconf_schema_install /etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
-%gconf_schema_install /etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
-%gconf_schema_install /etc/gconf/schemas/desktop_gnome_font_rendering.schemas
-%gconf_schema_install /etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
-%gconf_schema_install /etc/gconf/schemas/fontilus.schemas
-%gconf_schema_install /etc/gconf/schemas/themus.schemas
-/usr/bin/update-desktop-database
+%gconf_schema_install apps_gnome_settings_daemon_default_editor.schemas
+%gconf_schema_install apps_gnome_settings_daemon_keybindings.schemas
+%gconf_schema_install apps_gnome_settings_daemon_screensaver.schemas
+%gconf_schema_install desktop_gnome_font_rendering.schemas
+%gconf_schema_install desktop_gnome_peripherals_keyboard_xkb.schemas
+%gconf_schema_install fontilus.schemas
+%gconf_schema_install themus.schemas
+%ldconfig_post
+%update_desktop_database_post
 
 %preun
-if [ $1 = 0 ]; then
-       %gconf_schema_uninstall /etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
-       %gconf_schema_uninstall /etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
-       %gconf_schema_uninstall /etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
-       %gconf_schema_uninstall /etc/gconf/schemas/desktop_gnome_font_rendering.schemas
-       %gconf_schema_uninstall /etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
-       %gconf_schema_uninstall /etc/gconf/schemas/fontilus.schemas
-       %gconf_schema_uninstall /etc/gconf/schemas/themus.schemas
-fi
+%gconf_schema_uninstall apps_gnome_settings_daemon_default_editor.schemas
+%gconf_schema_uninstall apps_gnome_settings_daemon_keybindings.schemas
+%gconf_schema_uninstall apps_gnome_settings_daemon_screensaver.schemas
+%gconf_schema_uninstall desktop_gnome_font_rendering.schemas
+%gconf_schema_uninstall desktop_gnome_peripherals_keyboard_xkb.schemas
+%gconf_schema_uninstall fontilus.schemas
+%gconf_schema_uninstall themus.schemas
 
 %postun
-if [ $1 = 0 ]; then
-       umask 022
-       /sbin/ldconfig
-       /usr/bin/update-desktop-database
-fi
+%ldconfig_postun
+%update_desktop_database_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)