- release 4 (xulrunner 1.8.1.14)

[packages/galeon.git] / galeon.spec

diff --git a/galeon.spec b/galeon.spec
index a3e3abe7eeada4b9d699b364e96bfae3c93556dc..3f6934fc7ed20708d644b23f04570960bd2c070a 100644 (file)
--- a/galeon.spec
+++ b/galeon.spec
@@ -1,6 +1,5 @@
 #
 # Conditional build:
-%bcond_without mozilla_firefox # build without mozilla-firefox-devel
 %bcond_with    nautilus        # disable nautilus view
 %bcond_with    gcc2            # compile using gcc2 to get working gcc2-compiled java
                                # plugin (better get gcc3-compiled one).
@@ -15,19 +14,20 @@ Summary(pl):        Galeon - przegl
 Summary(pt_BR):        O galeon é um browser para o GNOME baseado no mozilla
 Summary(zh_CN):        »ùÓÚGeckoµÄGNOMEÁ÷ÀÀÆ÷
 Name:          galeon
-Version:       2.0.1
-Release:       8
+Version:       2.0.4
+Release:       4
 Epoch:         2
 License:       GPL
 Group:         X11/Applications/Networking
 Source0:       http://dl.sourceforge.net/galeon/%{name}-%{version}.tar.bz2
-# Source0-md5: 34d6e3a6ee78f9e4d12736e5d81b462b
+# Source0-md5: ee960c2d36b9bc7ab61ee77b1e7ee020
 #Source0:      %{name}-%{version}-%{snap}.tar.bz2
 Source1:       %{name}-config-tool.1
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-home_etc.patch
 Patch2:                %{name}-po.patch
 Patch3:                %{name}-mozilla.patch
+Patch4:                %{name}-agent.patch
 URL:           http://galeon.sourceforge.net/
 BuildRequires: GConf2-devel >= 2.4.0
 BuildRequires: ORBit2-devel >= 2.8.3
@@ -46,11 +46,7 @@ BuildRequires:       libgnomeui-devel >= 2.6.0
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.6.6
-%if %{with mozilla_firefox}
-BuildRequires: mozilla-firefox-devel
-%else
-BuildRequires: mozilla-devel >= 5:1.7
-%endif
+BuildRequires: xulrunner-devel >= 1.8.0.4
 %{?with_nautilus:BuildRequires:        nautilus-devel >= 2.4.0}
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
@@ -61,11 +57,7 @@ Requires(post,preun):        GConf2
 Requires:      glib2 >= 1:2.4.4
 Requires:      gtk+2 >= 2:2.4.4
 Requires:      libbonobo >= 2.4.0
-%if %{with mozilla_firefox}
-%requires_eq   mozilla-firefox
-%else
-Requires:      mozilla-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
-%endif
+%requires_eq   xulrunner
 Provides:      wwwbrowser
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -93,6 +85,7 @@ O galeon 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # regenerate - didn't compile with ORBit2 2.7.2
 cd idl
@@ -112,10 +105,11 @@ cp /usr/share/automake/mkinstalldirs .
 %configure \
        --disable-schemas-install \
        %if %{with nautilus}
-       --enable-nautilus-view=yes
+       --enable-nautilus-view=yes \
        %else
-       --enable-nautilus-view=no
+       --enable-nautilus-view=no \
        %endif
+       --with-mozilla=xulrunner
 %{__make}
 
 %install
@@ -130,8 +124,6 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
 # No components installed now.
 #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/*.la
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
 # galeon-2.0.mo, but gnome/help/galeon
 %find_lang galeon-2.0 --with-gnome --all-name