From: paladine <paladine@pld-linux.org>
Date: Fri, 8 Apr 2005 10:41:43 +0000 (+0000)
Subject: - new style macros
X-Git-Tag: auto/ac/gcalctool-5_5_41-3
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=eee2d6e32fe7b3eaf32aae05be71ed98a3e93fd3;p=packages%2Fgnome-calculator.git

- new style macros
- STBR

Changed files:
    gcalctool.spec -> 1.40
---

diff --git a/gcalctool.spec b/gcalctool.spec
index 8485d22..5e48c03 100644
--- a/gcalctool.spec
+++ b/gcalctool.spec
@@ -18,7 +18,7 @@ BuildRequires:	flex
 BuildRequires:	intltool
 BuildRequires:	libgnomeui-devel >= 2.10.0-2
 Buildrequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.196
+BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
 Requires(post,preun):	GConf2
 Requires(post,postun):	scrollkeeper
@@ -57,18 +57,14 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/scrollkeeper-update -q
-%gconf_schema_install /etc/gconf/schemas/gcalctool.schemas
+%gconf_schema_install gcalctool.schemas
+%scrollkeeper_update_post
 
 %preun
-if [ $1 = 0 ]; then
-	%gconf_schema_uninstall /etc/gconf/schemas/gcalctool.schemas
-fi
+%gconf_schema_uninstall gcalctool.schemas
 
 %postun
-if [ $1 = 0 ]; then
-	/usr/bin/scrollkeeper-update -q
-fi
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)