- merged galeon-gnome2 branch

- minor clean up

Changed files:
    galeon.spec -> 1.115

diff --git a/galeon.spec b/galeon.spec
index 4ed7a82b465dd522c69f103a22b226f8d69e1923..ede231956708c34979a8640b35a27c595956e9ff 100644 (file)
--- a/galeon.spec
+++ b/galeon.spec
@@ -1,42 +1,40 @@
 
-%define                minmozver       1.0
+%define                minmozver       1.1
+%define                snap            20021015
 
 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.6
-Release:       4
+Version:       1.2.99
+Release:       0.%{snap}
 Epoch:         2
 License:       GPL
 Group:         X11/Applications/Networking
-Source0:       http://unc.dl.sourceforge.net/sourceforge/galeon/%{name}-%{version}.tar.gz
+#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}-am_fix.patch
-Patch2:                %{name}-omf.patch
-Patch3:                %{name}-pl.patch
 URL:           http://galeon.sourceforge.net/
-BuildRequires: GConf-devel >= 1.0.9-2
-BuildRequires: ORBit-devel >= 0.5.0
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: GConf2-devel
+BuildRequires: ORBit2-devel
 BuildRequires: bison
-BuildRequires: gdk-pixbuf-devel >= 0.10.
+BuildRequires: bonobo-activation-devel
 BuildRequires: gettext-devel
-BuildRequires: gnome-core-devel >= 1.2.0
-BuildRequires: gnome-libs-devel >= 1.2.0
-BuildRequires: gnome-vfs-devel >= 0.5
+BuildRequires: gnome-vfs2-devel
+BuildRequires: gtk+2-devel >= 2.0.6
 BuildRequires: intltool
-BuildRequires: libglade-gnome-devel
+BuildRequires: libglade2-devel
+BuildRequires: libgnomeui-devel
 BuildRequires: libstdc++-devel
-BuildRequires: libxml-devel >= 1.8.7
+BuildRequires: libxml2-devel
 BuildRequires: mozilla-embedded-devel >= %{minmozver}
-BuildRequires: oaf-devel >= 0.6.2
+BuildRequires: nautilus-devel >= 2.0.0
 BuildRequires: openssl-devel
 BuildRequires: scrollkeeper
-Requires:      GConf >= 1.0.4-1
 Requires:      mozilla-embedded = %(rpm -q --qf '%{VERSION}' --whatprovides mozilla-embedded)
 Requires(post):        GConf
 Requires(post):        mozilla
@@ -48,8 +46,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
-%define                _sysconfdir     /etc/X11/GNOME
-%define         _omf_dest_dir   %(scrollkeeper-config --omfdir)
+%define                _sysconfdir     /etc/X11/GNOME2
 
 %description
 Gnome browser based on Gecko (Mozilla rendering engine).
@@ -64,15 +61,15 @@ O galeon 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 rm -f missing
-xml-i18n-toolize --copy --force
-%{__gettextize}
-%{__aclocal} -I %{_aclocaldir}/gnome
+glib-gettextize --copy --force
+#xml-i18n-toolize --copy --force
+intltoolize --copy --force
+libtoolize --copy --force
+%{__aclocal}
+%{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
@@ -85,7 +82,7 @@ xml-i18n-toolize --copy --force
        --disable-werror \
        --with-mozilla-snapshot=1.0 \
        --enable-gconf-source=%{_sysconfdir}/gconf/schemas \
-       --enable-nautilus-view=no
+       --enable-nautilus-view=yes
 
 %{__make}
 
@@ -98,11 +95,11 @@ 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
+#mv -f $RPM_BUILD_ROOT%{_bindir}/galeon-bin $RPM_BUILD_ROOT%{_bindir}/galeon
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
 
-%find_lang %{name} --with-gnome
+%find_lang galeon-2.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,21 +109,21 @@ rm -rf $RPM_BUILD_ROOT
 umask 022
 rm -f %{_libdir}/mozilla/component.reg
 MOZILLA_FIVE_HOME=%{_libdir}/mozilla regxpcom
-gconftool --shutdown
-GCONF_CONFIG_SOURCE=xml::%{_sysconfdir}/gconf/gconf.xml.defaults gconftool --makefile-install-rule %{_sysconfdir}/gconf/schemas/galeon.schemas 2>dev/null >/dev/null
+GCONF_CONFIG_SOURCE="" gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/galeon.schemas >/dev/null
 
 %postun -p /usr/bin/scrollkeeper-update
 
-%files -f %{name}.lang
+%files -f galeon-2.0.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
-%{_applnkdir}/Network/WWW/*
+#%{_applnkdir}/Network/WWW/*
 %{_libdir}/%{name}
+%{_libdir}/bonobo/servers/*
 %{_datadir}/galeon
-%{_datadir}/gnome/help/galeon-manual
-%{_datadir}/gnome/ui/*.xml
-%{_datadir}/oaf/*
+%{_datadir}/applications/*
+%{_datadir}/gnome/help/*
+%{_datadir}/gnome-2.0/ui/*.xml
 %{_omf_dest_dir}/%{name}
 %{_datadir}/sounds/galeon
 %{_pixmapsdir}/*