- massive attack: do not put bonobo servers into /usr/lib; remove

[packages/galeon.git] / galeon.spec

diff --git a/galeon.spec b/galeon.spec
index ede231956708c34979a8640b35a27c595956e9ff..5a17d016277d31a40e4bb36b4c790dd179afc9d1 100644 (file)
--- a/galeon.spec
+++ b/galeon.spec
@@ -1,14 +1,14 @@
 
-%define                minmozver       1.1
-%define                snap            20021015
+%define                minmozver       1.2
+%define                snap            20021127
 
 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.2.99
-Release:       0.%{snap}
+Version:       1.3
+Release:       0.%{snap}.1
 Epoch:         2
 License:       GPL
 Group:         X11/Applications/Networking
@@ -16,13 +16,14 @@ Group:              X11/Applications/Networking
 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
+BuildRequires: bonobo-activation-devel >= 2.1.0
 BuildRequires: gettext-devel
 BuildRequires: gnome-vfs2-devel
 BuildRequires: gtk+2-devel >= 2.0.6
@@ -35,8 +36,10 @@ BuildRequires:       mozilla-embedded-devel >= %{minmozver}
 BuildRequires: nautilus-devel >= 2.0.0
 BuildRequires: openssl-devel
 BuildRequires: scrollkeeper
+BuildRequires: bonobo-activation >= 2.1.0-3
+BuildRequires: rpm-build >= 4.1-7
 Requires:      mozilla-embedded = %(rpm -q --qf '%{VERSION}' --whatprovides mozilla-embedded)
-Requires(post):        GConf
+Requires(post):        GConf2
 Requires(post):        mozilla
 Requires(post):        scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,6 +64,7 @@ O galeon 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm -f missing
@@ -80,7 +84,7 @@ libtoolize --copy --force
        --disable-included-gettext \
        --disable-install-schemas \
        --disable-werror \
-       --with-mozilla-snapshot=1.0 \
+       --with-mozilla-snapshot=1.2 \
        --enable-gconf-source=%{_sysconfdir}/gconf/schemas \
        --enable-nautilus-view=yes
 
@@ -95,8 +99,6 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man1
        Networkdir=%{_applnkdir}/Network/WWW \
        omf_dest_dir=%{_omf_dest_dir}/%{name}
 
-#mv -f $RPM_BUILD_ROOT%{_bindir}/galeon-bin $RPM_BUILD_ROOT%{_bindir}/galeon
-
 install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
 
 %find_lang galeon-2.0
@@ -109,15 +111,14 @@ rm -rf $RPM_BUILD_ROOT
 umask 022
 rm -f %{_libdir}/mozilla/component.reg
 MOZILLA_FIVE_HOME=%{_libdir}/mozilla regxpcom
-GCONF_CONFIG_SOURCE="" gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/galeon.schemas >/dev/null
+%gconf_schema_install
 
 %postun -p /usr/bin/scrollkeeper-update
 
 %files -f galeon-2.0.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog NEWS README*
 %attr(755,root,root) %{_bindir}/*
-#%{_applnkdir}/Network/WWW/*
 %{_libdir}/%{name}
 %{_libdir}/bonobo/servers/*
 %{_datadir}/galeon