- added noautoreqdep for mozilla libraries (from mozilla-embedded or

[packages/galeon.git] / galeon.spec

diff --git a/galeon.spec b/galeon.spec
index e52af494730c973735ebd65a7a1121fc5fd8276e..c40cefcf48784eb70074ca655d558745694d43ff 100644 (file)
--- a/galeon.spec
+++ b/galeon.spec
@@ -1,36 +1,41 @@
+
+%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.0.1
-Release:       3
-Epoch:         1
+Version:       1.2.1
+Release:       1
+Epoch:         2
 License:       GPL
 Group:         X11/Applications/Networking
-Group(de):     X11/Applikationen/Netzwerkwesen
-Group(pl):     X11/Aplikacje/Sieciowe
 Source0:       http://prdownloads.sourceforge.net/galeon/%{name}-%{version}.tar.gz
 Patch0:                %{name}-mozilla_five_home.patch
+Patch1:                %{name}-am_fix.patch
 URL:           http://galeon.sourceforge.net/
 BuildRequires: GConf-devel >= 1.0.4-1
 BuildRequires: ORBit-devel >= 0.5.0
+BuildRequires: bison
+BuildRequires: gdk-pixbuf-devel >= 0.10.
 BuildRequires: gettext-devel
 BuildRequires: gnome-core-devel >= 1.2.0
 BuildRequires: gnome-libs-devel >= 1.2.0
 BuildRequires: gnome-vfs-devel >= 0.5
-BuildRequires: libxml-devel >= 1.8.7
+BuildRequires: intltool
 BuildRequires: libglade-devel
 BuildRequires: libstdc++-devel
-BuildRequires: mozilla-devel >= 0.9.6
-BuildRequires: oaf >= 0.6.2
+BuildRequires: libxml-devel >= 1.8.7
+BuildRequires: mozilla-embedded-devel >= %{minmozver}
 BuildRequires: oaf-devel >= 0.6.2
-BuildRequires: gdk-pixbuf-devel >= 0.10.
-BuildRequires: bison
-BuildRequires: xml-i18n-tools
+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
@@ -48,21 +53,23 @@ O galeon 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-#sed -e s/AM_GNOME_GETTEXT/AM_GNU_GETTEXT/ configure.in >configure.in.tmp
-#mv -f configure.in.tmp configure.in
-#rm -f missing
-#aclocal -I %{_aclocaldir}/gnome
-#autoconf
-#automake -a -c
-%configure2_13 \
+rm -f missing
+xml-i18n-toolize --copy --force
+gettextize --copy --force
+aclocal -I %{_aclocaldir}/gnome
+autoconf
+automake -a -c -f
+%configure \
        --with-mozilla-libs=%{_libdir} \
        --with-mozilla-includes=%{_includedir}/mozilla \
        --with-mozilla-home=%{_libdir}/mozilla \
        --enable-nls \
        --disable-included-gettext \
        --disable-install-schemas \
+       --disable-werror \
        --enable-gconf-source=%{_sysconfdir}/gconf/schemas
 
 %{__make}
@@ -95,8 +102,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc *.gz
 %attr(755,root,root) %{_bindir}/*
 %{_applnkdir}/Network/WWW/*
+%{_libdir}/%{name}
 %{_datadir}/galeon
+%{_datadir}/gnome/help/galeon-manual
+%{_datadir}/gnome/ui/*.xml
 %{_datadir}/oaf/*
+%{_datadir}/omf/*
 %{_datadir}/sounds/galeon
 %{_pixmapsdir}/*
 %{_sysconfdir}/gconf/schemas/*