devel/galeon galeon.spec, 1.1, 1.2 sources, 1.2, 1.3 galeon-1.3.10-moz-home-detect.patch, 1.1, NONE

[Dams Nade (anvil)]

Author: anvil

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

Modified Files:
	galeon.spec sources 
Removed Files:
	galeon-1.3.10-moz-home-detect.patch 
Log Message:
galeon: updated to 1.3.19


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/devel/galeon/galeon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- galeon.spec	8 Nov 2004 04:21:30 -0000	1.1
+++ galeon.spec	23 Jan 2005 19:40:22 -0000	1.2
@@ -1,36 +1,34 @@
-%define extraversion	a
-
 Summary:   	GNOME2 Web browser based on Mozilla
 Name:      	galeon
-Version:   	1.3.11
-Release:   	0.fdr.3.%{extraversion}.fixed.1
+Version:   	1.3.19
+Release:   	1
 Epoch:		0
 License: 	GPL
 Group:     	Applications/Internet
 URL:       	http://galeon.sourceforge.net/
-Source0:    	%{name}-%{version}%{?extraversion}-fixed.tar.bz2
-Patch0:		galeon-1.3.10-moz-home-detect.patch
+Source0:    	%{name}-%{version}%{?extraversion}.tar.bz2
 BuildRoot:  	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-Requires(post,postun): scrollkeeper
-BuildRequires:	gettext gtk2-devel mozilla-nspr-devel desktop-file-utils
-BuildRequires:	mozilla-devel >= 35:1.4
-BuildRequires:	libxml2-devel >= 0:2.4.0
-BuildRequires:	libgnomeui-devel >= 0:2.0.5
+Requires:	scrollkeeper 
+Requires:	mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null)
+BuildRequires:	gettext mozilla-nspr-devel desktop-file-utils
+BuildRequires:	gtk2-devel >= 0:2.4.0
+BuildRequires:	mozilla-devel >= 37:1.7.2
+BuildRequires:	libxml2-devel >= 0:2.6.6
+BuildRequires:	libgnomeui-devel >= 0:2.5.2
 %{!?_without_nautilus:BuildRequires:	eel2-devel nautilus}
 
 # -----------------------------------------------------------------------------
 
 %description
-Galeon is a web browser built around Gecko (Mozilla 's rendering engine) 
-and Necko (Mozilla's networking engine). It's a GNOME web browser, 
-designed to take advantage of as many GNOME technologies as makes sense. 
-Galeon was written to do just one thing - browse the web.
+Galeon is a web browser built around Gecko (Mozilla's rendering
+engine) and Necko (Mozilla's networking engine). It's a GNOME web
+browser, designed to take advantage of as many GNOME technologies as
+makes sense. Galeon was written to do just one thing - browse the web.
 
 # -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
-%patch -p1 -b .moz-home-detect
 
 # -----------------------------------------------------------------------------
 
@@ -45,6 +43,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/galeon.desktop
 # Overriding galeon *bluecurve* icon
@@ -71,6 +70,13 @@
 %{_bindir}/galeon-config-tool --pkg-install-schemas
 scrollkeeper-update||:
 
+%preun
+if [ "$0" = 1 ] ; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+        %{_sysconfdir}/gconf/schemas/galeon.schemas >/dev/null
+fi||:
+
 %postun
 scrollkeeper-update||:
 
@@ -80,16 +86,13 @@
 %config %{_sysconfdir}/gconf/schemas/galeon.schemas
 %config %{_sysconfdir}/sound/events/galeon.soundlist
 %{_bindir}/galeon
-%{_bindir}/galeon-bin
 %{_bindir}/galeon-config-tool
-%{_libdir}/galeon
 %{_mandir}/man1/galeon.1*
 %{_datadir}/galeon
 %{_datadir}/gnome/help/galeon
 %{_datadir}/pixmaps/galeon.png
 %{_datadir}/sounds/galeon
 %{_datadir}/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
-%{_datadir}/gnome-2.0/ui/galeon-ui.xml
 %{_datadir}/gnome-2.0/ui/nautilus-galeon-view-ui.xml
 %{_datadir}/omf/galeon
 %{_libdir}/bonobo/servers/GNOME_Galeon_Automation.server
@@ -99,6 +102,47 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sun Jan 23 2005 Dams <anvil[AT]livna.org> 0:1.3.19-1
+- Rebuilt for Extras
+
+* Sun Jan 16 2005 Dams <anvil[AT]livna.org> 0:1.3.19-0.fdr.1
+- Updated to 1.3.19
+- Removed old mkinstalldirs fix
+
+* Wed Oct 27 2004 Dams <anvil[AT]livna.org> 0:1.3.18-0.fdr.1
+- Updated to 1.3.18
+
+* Thu Sep 30 2004 Dams <anvil[AT]livna.org> 0:1.3.17-0.fdr.2
+- Requiring versioned mozilla as it's borked otherwise.
+
+* Mon Aug  9 2004 Dams <anvil[AT]livna.org> 0:1.3.17-0.fdr.1
+- Updated to 1.3.17
+- Dropped patch0
+- Updated version requirement for build dependencies
+
+* Sat Aug  7 2004 Dams <anvil[AT]livna.org> 0:1.3.16-0.fdr.2
+- Rebuild
+
+* Sat Jul  3 2004 Dams <anvil[AT]livna.org> 0:1.3.16-0.fdr.1
+- Updated to 1.3.16
+- Fixed preun scriptlet
+
+* Wed Jun  2 2004 Dams <anvil[AT]livna.org> 0:1.3.15-0.fdr.1
+- Updated to 1.3.15
+
+* Sun Mar 21 2004 Dams <anvil[AT]livna.org> 0:1.3.14-0.fdr.1
+- Updated to 1.3.14
+
+* Tue Feb 17 2004 Dams <anvil[AT]livna.org> 0:1.3.13-0.fdr.1
+- Updated to 1.3.13
+- Fixed build (missing mkinstalldirs..)
+
+* Fri Jan  9 2004 Dams <anvil[AT]livna.org> 0:1.3.11-0.fdr.5.a.fixed
+- Added Requires:mozilla (non-versioned)
+
+* Thu Jan  8 2004 Dams <anvil[AT]livna.org> 0:1.3.11-0.fdr.4.a.fixed
+- Removing schemas in preun
+
 * Sat Dec 20 2003 Dams <anvil[AT]livna.org> 0:1.3.11-0.fdr.3.a-fixed
 - Updated to 1.3.11a-fixed
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/galeon/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:21:30 -0000	1.2
+++ sources	23 Jan 2005 19:40:22 -0000	1.3
@@ -1 +1 @@
-81170880d32052a9ff34da4ae60edc80  galeon-1.3.11a-fixed.tar.bz2
+7d272c6b1863252026386fd299122841  galeon-1.3.19.tar.bz2


--- galeon-1.3.10-moz-home-detect.patch DELETED ---