rpms/galeon/FC-4 galeon.spec,1.7,1.8 sources,1.5,1.6

[Dams Nade (anvil)]

Author: anvil

Update of /cvs/extras/rpms/galeon/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22387

Modified Files:
	galeon.spec sources 
Log Message:
galeon: 1.3.21-3_fc4


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- galeon.spec	2 May 2005 09:23:20 -0000	1.7
+++ galeon.spec	30 Jun 2005 20:44:34 -0000	1.8
@@ -1,12 +1,11 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
-Version:	1.3.20
-Release:	2.fc4
+Version:	1.3.21
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-Patch0:		galeon-autoreconf.patch.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Requires:	scrollkeeper
 Requires:	mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null)
@@ -15,7 +14,7 @@
 BuildRequires:	mozilla-devel >= 37:1.7.2
 BuildRequires:	libxml2-devel >= 2.6.6
 BuildRequires:	libgnomeui-devel >= 2.5.2
-%{!?_without_nautilus:BuildRequires:	eel2-devel nautilus}
+BuildRequires:	autoconf
 
 %description
 Galeon is a web browser built around Gecko (Mozilla's rendering
@@ -26,12 +25,15 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
-# Patch creation after autoreconf -f -i and rm -rf autom4te.cache/ 
-%patch0 -p 1 -b .patch0
+
+%ifarch x86_64
+aclocal
+autoconf
+%endif
 
 %build
 %configure \
-%{!?_without_nautilus:	--enable-nautilus-view}	\
+	--disable-nautilus-view			\
 	--disable-werror			\
 	--disable-schemas-install
 make %{?_smp_mflags}
@@ -65,7 +67,7 @@
 scrollkeeper-update||:
 
 %preun
-if [ "$1" = "1" ] ; then
+if [ "$1" = "0" ] ; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
         %{_sysconfdir}/gconf/schemas/galeon.schemas >/dev/null
@@ -96,9 +98,22 @@
 
 
 %changelog
+* Thu Jun 30 2005 Dams <anvil[AT]livna.org> - 1.3.21
+- Disabled nautilus view for FC4
+- Fixed x86_64 build
+
+* Fri May 27 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.21-2.fc3
+- use dist tag macro and submit another build request (#157924)
+
+* Mon May 23 2005 Dams <anvil[AT]livna.org> - 1.3.21-1.fc3
+- Dropped patch0
+
+* Sun May 22 2005 Dams <anvil[AT]livna.org> - 1.3.21-1.fc3
+- Updated to 1.3.21
+- Fixed preun scriptlet (not removing schemas on upgrade)
+
 * Mon May 02 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.3.20-2
 - Add autoreconf-Patch for fix build on x86_64
-- Add distag fc4 so this version is higher than the one for fc3
 
 * Wed Mar 16 2005 Dams <anvil[AT]livna.org> - 1.3.20-1
 - Updated to 1.3.20


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galeon/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 May 2005 09:23:20 -0000	1.5
+++ sources	30 Jun 2005 20:44:34 -0000	1.6
@@ -1,2 +1 @@
-13954dd2f11748c02f3071ac9987d7d3  galeon-1.3.20.tar.bz2
-1bcafaba2b8c14221ad51566e003b8c7  galeon-autoreconf.patch.bz2
+5106e037bb52bdb234b3fc09c1e0a3f3  galeon-1.3.21.tar.bz2