- use new style macros

- STBR

Changed files:
    eog.spec -> 1.72

diff --git a/eog.spec b/eog.spec
index a517a32d8dc6baaeac9113dadd1bc49801e8066e..8805dca13c6730bba6dec9272f233c7ec7287163 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -25,6 +25,7 @@ BuildRequires:        libgnomeui-devel >= 2.10.0-2
 BuildRequires: libjpeg-devel
 BuildRequires: libtool
 BuildRequires: popt-devel
+BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: xft-devel >= 2.1.2
 Requires(post,preun):  GConf2
 Requires(post,postun): desktop-file-utils
@@ -48,8 +49,8 @@ Aplicativo para visualizar imagens chamado Eye of GNOME.
 
 %build
 %{__libtoolize}
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
 %{__aclocal}
 %{__autoheader}
 gnome-doc-common
@@ -74,22 +75,16 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -rf $RPM_BUILD_ROOT
 
 %post
-umask 022
-%gconf_schema_install /etc/gconf/schemas/eog.schemas
-/usr/bin/scrollkeeper-update -q
-/usr/bin/update-desktop-database
+%gconf_schema_install eog.schemas
+%scrollkeeper_update_post
+%update_desktop_database_post
 
 %preun
-if [ $1 = 0 ]; then
-       %gconf_schema_uninstall /etc/gconf/schemas/eog.schemas
-fi
+%gconf_schema_uninstall eog.schemas
 
 %postun
-if [ $1 = 0 ]; then
-       umask 022
-       /usr/bin/scrollkeeper-update -q
-       /usr/bin/update-desktop-database
-fi
+%scrollkeeper_update_postun
+%update_desktop_database_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)