rpms/galeon/devel galeon.spec,1.13,1.14

[Denis Leroy (denis)]

Author: denis

Update of /cvs/extras/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11878

Modified Files:
	galeon.spec 
Log Message:
- Fixed preun script, was removing schemas after update.
- Removed galeon-config-tool. Now using well-known Fedora scriptlets.
- Added scripts Requires



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- galeon.spec	30 Nov 2005 07:49:13 -0000	1.13
+++ galeon.spec	5 Dec 2005 04:53:20 -0000	1.14
@@ -1,13 +1,12 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-Requires:	scrollkeeper
 Requires:	mozilla = 37:1.7.12
 BuildRequires:	gettext mozilla-nspr-devel desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.4.0
@@ -19,6 +18,13 @@
 %ifarch x86_64
 BuildRequires:  autoconf automake libtool intltool
 %endif
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
+Requires(pre):    GConf2
+Requires(post):   GConf2
+Requires(preun):  GConf2
+Requires(post):   scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 Galeon is a web browser built around Gecko (Mozilla's rendering
@@ -38,7 +44,8 @@
 %build
 %configure \
 	--disable-nautilus-view			\
-	--disable-werror
+	--disable-werror                        \
+	--disable-schemas-install
 make %{?_smp_mflags}
 
 
@@ -47,6 +54,7 @@
 
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/galeon.desktop
+rm -f $RPM_BUILD_ROOT%{_bindir}/galeon-config-tool
 # Overriding galeon *bluecurve* icon
 perl -pi -e 's|Icon=.+|Icon=%{_datadir}/pixmaps/galeon.png|g' galeon.desktop
 desktop-file-install --vendor fedora \
@@ -63,23 +71,26 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
-%{_bindir}/galeon-config-tool --fix-gconf-permissions
-%{_bindir}/galeon-config-tool --pkg-install-schemas
-scrollkeeper-update||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+update-desktop-database > /dev/null 2>&1 || :
+
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/galeon.schemas > /dev/null || :
+killall -HUP gconfd-2 || :
 
 %preun
-if [ "$1" = "1" ] ; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule \
-        %{_sysconfdir}/gconf/schemas/galeon.schemas >/dev/null
-fi||:
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/galeon.schemas > /dev/null || :
+    killall -HUP gconfd-2 || :
+fi
 
 %postun
-scrollkeeper-update||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+scrollkeeper-update -q || :
+update-desktop-database > /dev/null 2>&1 || :
 
 
 %files -f galeon-2.0.lang
@@ -88,7 +99,6 @@
 %config %{_sysconfdir}/gconf/schemas/galeon.schemas
 %config %{_sysconfdir}/sound/events/galeon.soundlist
 %{_bindir}/galeon
-%{_bindir}/galeon-config-tool
 %{_mandir}/man1/galeon.1*
 %{_datadir}/galeon
 %{_datadir}/gnome/help/galeon
@@ -103,6 +113,11 @@
 
 
 %changelog
+* Sun Dec  4 2005 Denis Leroy <denis at poolshark.org> - 2.0.0-2
+- Fixed preun script, was removing schemas after update.
+- Removed galeon-config-tool. Now using well-known Fedora scriptlets.
+- Added scripts Requires
+
 * Mon Nov 28 2005 Denis Leroy <denis at poolshark.org> - 2.0.0-1
 - Update to 2.0.0