- added mozilla17 patch (compile fix for mozilla-1.7)

[packages/galeon.git] / galeon.spec

diff --git a/galeon.spec b/galeon.spec
index d14e2f5b9003eb88fb4beae1342465b53229fe48..4cbdfdf215bde03929f35674fe98469a6b3f71a5 100644 (file)
--- a/galeon.spec
+++ b/galeon.spec
@@ -7,7 +7,7 @@
                        # mozilla instead. To compile wit this option, You
                        # have to install mozilla compiled with gcc2.
 #
-%define                minmozver       5:1.6
+%define                minmozver       5:1.7
 %define                snap    20040117
 
 Summary:       Galeon - gecko-based GNOME web browser
@@ -15,41 +15,45 @@ 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:       1.3.13a
+Version:       1.3.15
 Release:       2
 Epoch:         2
 License:       GPL
 Group:         X11/Applications/Networking
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-# Source0-md5: c29bdfb23fdafddfcfb6ae7fc6c822fd
+# Source0-md5: 9334cbdf0734f626470e788ce37d21a6
 #Source0:      %{name}-%{version}-%{snap}.tar.bz2
 Source1:       %{name}-config-tool.1
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-home_etc.patch
 Patch2:                %{name}-locale-names.patch
+Patch3:                %{name}-mozilla17.patch
+Patch4:                %{name}-gcc34.patch
 URL:           http://galeon.sourceforge.net/
 BuildRequires: GConf2-devel >= 2.4.0
 BuildRequires: ORBit2-devel >= 2.8.3
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.4.0
 BuildRequires: gnome-vfs2-devel >= 2.4.0
-BuildRequires: gtk+2-devel >= 2.2.0
+BuildRequires: gtk+2-devel >= 2:2.4.0
 BuildRequires: intltool
 BuildRequires: libbonoboui-devel >= 2.4.0
-BuildRequires: libglade2-devel >= 2.0.1
+BuildRequires: libglade2-devel >= 1:2.4.0
 BuildRequires: libgnomeui-devel >= 2.4.0
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.4.0
+BuildRequires: libxml2-devel >= 2.6.6
 BuildRequires: mozilla-devel >= %{minmozver}
 %{?with_nautilus:BuildRequires:        nautilus-devel >= 2.4.0}
-BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: scrollkeeper >= 0.1.4
 Requires(post):        GConf2
 Requires(post):        scrollkeeper
+Requires:      glib2 >= 1:2.4.2
+Requires:      gtk+2 >= 2:2.4.3
 Requires:      libbonobo >= 2.4.0
 Requires:      mozilla = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -73,10 +77,12 @@ interpretacji stron Mozilli).
 O galeon é um browser para o GNOME baseado no mozilla.
 
 %prep
-%setup -q -n %{name}-1.3.13
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 mv po/{no,nb}.po
 
@@ -87,6 +93,7 @@ mv Galeon*.[ch] ../src
 
 %build
 rm -f missing
+cp /usr/share/automake/mkinstalldirs .
 glib-gettextize --copy --force
 intltoolize --copy --force
 %{__libtoolize}
@@ -101,7 +108,6 @@ intltoolize --copy --force
        %else
        --enable-nautilus-view=no
        %endif
-       
 
 %{__make}