rpms/galeon/devel .cvsignore, 1.4, 1.5 galeon.spec, 1.7, 1.8 sources, 1.5, 1.6

[Denis Leroy (denis)]

Author: denis

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

Modified Files:
	.cvsignore galeon.spec sources 
Log Message:

- Update to 1.3.21
- Got rid of requires with rpm -q for ppc build
- Added dist tag
- Removed autoreconf patch
- Added gnome-desktop-devel buildrequires. Added calls to update-desktop-database



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 May 2005 09:23:20 -0000	1.4
+++ .cvsignore	4 Oct 2005 01:21:03 -0000	1.5
@@ -1,2 +1 @@
-galeon-1.3.11a-fixed.tar.bz2
-galeon-autoreconf.patch.bz2
+galeon-1.3.21.tar.bz2


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/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	4 Oct 2005 01:21:03 -0000	1.8
@@ -1,21 +1,24 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
-Version:	1.3.20
-Release:	2.fc4
+Version:	1.3.21
+Release:	1%{?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)
+Requires:	mozilla = 37:1.7.11
 BuildRequires:	gettext mozilla-nspr-devel desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.4.0
+BuildRequires:	gnome-desktop-devel
 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:  perl(XML::Parser) scrollkeeper
+%ifarch x86_64
+BuildRequires:  autoconf automake libtool intltool
+%endif
 
 %description
 Galeon is a web browser built around Gecko (Mozilla's rendering
@@ -26,12 +29,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}
@@ -63,6 +69,7 @@
 %{_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 || :
 
 %preun
 if [ "$1" = "1" ] ; then
@@ -73,6 +80,7 @@
 
 %postun
 scrollkeeper-update||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %files -f galeon-2.0.lang
@@ -96,6 +104,13 @@
 
 
 %changelog
+* Mon Oct  3 2005 Denis Leroy <denis at poolshark.org> - 1.3.21-14
+- Update to 1.3.21
+- Got rid of requires with rpm -q for ppc build
+- Added dist tag
+- Removed autoreconf patch
+- Added gnome-desktop-devel buildrequires. Added calls to update-desktop-database
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/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	4 Oct 2005 01:21:03 -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