- updated to version 1.3.3

[packages/galeon.git] / galeon.spec

diff --git a/galeon.spec b/galeon.spec
index 5a17d016277d31a40e4bb36b4c790dd179afc9d1..7dbd19263de6cfbab70591699391aec2b17535af 100644 (file)
--- a/galeon.spec
+++ b/galeon.spec
@@ -1,29 +1,33 @@
-
-%define                minmozver       1.2
-%define                snap            20021127
+#
+# Conditional build:
+# _with_gcc2           - compile using gcc2 to get working java plugin.
+#                        Flash plugin seems to still doesn't work, use 
+#                        mozilla instead. To compile wit this option, You 
+#                        have to install mozilla compiled with gcc2.
+#
+%define                minmozver       1.3b-0.2
+%define                snap            20030305
 
 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
 Summary(zh_CN):        »ùÓÚGeckoµÄGNOMEÁ÷ÀÀÆ÷
 Name:          galeon
-Version:       1.3
-Release:       0.%{snap}.1
+Version:       1.3.3
+Release:       1
 Epoch:         2
 License:       GPL
 Group:         X11/Applications/Networking
-#Source0:      http://unc.dl.sourceforge.net/sourceforge/galeon/%{name}-%{version}.tar.gz
-Source0:       %{name}-%{version}.%{snap}.tar.bz2
+Source0:       http://unc.dl.sourceforge.net/sourceforge/galeon/%{name}-%{version}.tar.gz
+#Source0:      %{name}-%{version}-%{snap}.tar.bz2
 Source1:       %{name}-config-tool.1
-Patch0:                %{name}-mozilla_five_home.patch
-Patch1:                %{name}-bookmarks_pixmaps_path.patch
 URL:           http://galeon.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: GConf2-devel
 BuildRequires: ORBit2-devel
 BuildRequires: bison
-BuildRequires: bonobo-activation-devel >= 2.1.0
+BuildRequires: bonobo-activation-devel >= 2.2.0
 BuildRequires: gettext-devel
 BuildRequires: gnome-vfs2-devel
 BuildRequires: gtk+2-devel >= 2.0.6
@@ -34,10 +38,10 @@ BuildRequires:      libstdc++-devel
 BuildRequires: libxml2-devel
 BuildRequires: mozilla-embedded-devel >= %{minmozver}
 BuildRequires: nautilus-devel >= 2.0.0
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel >= 0.9.7
 BuildRequires: scrollkeeper
-BuildRequires: bonobo-activation >= 2.1.0-3
-BuildRequires: rpm-build >= 4.1-7
+BuildRequires: bonobo-activation >= 2.2.0
+BuildRequires: rpm-build >= 4.1-10
 Requires:      mozilla-embedded = %(rpm -q --qf '%{VERSION}' --whatprovides mozilla-embedded)
 Requires(post):        GConf2
 Requires(post):        mozilla
@@ -47,9 +51,10 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # can be provided by mozilla or mozilla-embedded
 %define                _noautoreqdep   libgtkembedmoz.so libgtksuperwin.so libxpcom.so
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-%define                _sysconfdir     /etc/X11/GNOME2
+%if%{?_with_gcc2:1}%{!?_with_gcc2:0}
+%define         __cc            gcc2
+%define         __cxx           gcc2
+%endif
 
 %description
 Gnome browser based on Gecko (Mozilla rendering engine).
@@ -63,15 +68,12 @@ O galeon 
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 rm -f missing
 glib-gettextize --copy --force
-#xml-i18n-toolize --copy --force
 intltoolize --copy --force
-libtoolize --copy --force
+%{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
@@ -82,9 +84,9 @@ libtoolize --copy --force
        --with-mozilla-home=%{_libdir}/mozilla \
        --enable-nls \
        --disable-included-gettext \
-       --disable-install-schemas \
+       --disable-schemas-install \
        --disable-werror \
-       --with-mozilla-snapshot=1.2 \
+       --with-mozilla-snapshot=1.3b \
        --enable-gconf-source=%{_sysconfdir}/gconf/schemas \
        --enable-nautilus-view=yes
 
@@ -95,9 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       Networkdir=%{_applnkdir}/Network/WWW \
-       omf_dest_dir=%{_omf_dest_dir}/%{name}
+       DESTDIR=$RPM_BUILD_ROOT 
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1