X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=galeon.spec;h=c40cefcf48784eb70074ca655d558745694d43ff;hb=0cc1369db28abea60256733d081f37197bb71c79;hp=6105d1fe0c73dc1b2cb368d2a6ab9205f04f4287;hpb=9aaab57377f4c52ab0e8f29c9c9a6caed9b28ca1;p=packages%2Fgaleon.git

diff --git a/galeon.spec b/galeon.spec
index 6105d1f..c40cefc 100644
--- a/galeon.spec
+++ b/galeon.spec
@@ -1,8 +1,11 @@
+
+%define		minmozver	0.9.9
+
 Summary:	Galeon - gecko-based GNOME web browser
 Summary(pl):	Galeon - przegl±darka WWW dla GNOME
 Summary(pt_BR):	O galeon é um browser para o gnome baseado no mozilla
 Name:		galeon
-Version:	1.2.0
+Version:	1.2.1
 Release:	1
 Epoch:		2
 License:	GPL
@@ -10,7 +13,6 @@ Group:		X11/Applications/Networking
 Source0:	http://prdownloads.sourceforge.net/galeon/%{name}-%{version}.tar.gz
 Patch0:		%{name}-mozilla_five_home.patch
 Patch1:		%{name}-am_fix.patch
-Patch2:		%{name}-gcc31.patch
 URL:		http://galeon.sourceforge.net/
 BuildRequires:	GConf-devel >= 1.0.4-1
 BuildRequires:	ORBit-devel >= 0.5.0
@@ -24,13 +26,16 @@ BuildRequires:	intltool
 BuildRequires:	libglade-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libxml-devel >= 1.8.7
-BuildRequires:	mozilla-devel >= 0.9.9
+BuildRequires:	mozilla-embedded-devel >= %{minmozver}
 BuildRequires:	oaf-devel >= 0.6.2
 BuildRequires:	openssl-devel
 Requires:	GConf >= 1.0.4-1
-%requires_eq	mozilla
+Requires:	mozilla-embedded = %(rpm -q --qf '%{VERSION}' --whatprovides mozilla-embedded)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# can be provided by mozilla or mozilla-embedded
+%define		_noautoreqdep	libgtkembedmoz.so libplds4.so libplc4.so libnspr4.so libgtksuperwin.so libxpcom.so
+
 %define		_prefix		/usr/X11R6
 %define		_mandir		%{_prefix}/man
 %define		_sysconfdir	/etc/X11/GNOME
@@ -49,19 +54,14 @@ O galeon 
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-sed -e s/AM_GNOME_GETTEXT/AM_GNU_GETTEXT/ configure.in >configure.in.tmp
-# FIXME: Broken GCONF?
-#sed -e s/AM_GCONF_SOURCE/echo/ configure.in.tmp >configure.in
-#mv -f configure.in.tmp configure.in
 rm -f missing
 xml-i18n-toolize --copy --force
 gettextize --copy --force
 aclocal -I %{_aclocaldir}/gnome
 autoconf
-automake -a -c
+automake -a -c -f
 %configure \
 	--with-mozilla-libs=%{_libdir} \
 	--with-mozilla-includes=%{_includedir}/mozilla \
@@ -105,6 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}
 %{_datadir}/galeon
 %{_datadir}/gnome/help/galeon-manual
+%{_datadir}/gnome/ui/*.xml
 %{_datadir}/oaf/*
 %{_datadir}/omf/*
 %{_datadir}/sounds/galeon