X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=galeon.spec;h=4dc6fd9cd135184ae7b86f8c36ca08e31a0c5cfb;hb=c607ade1bd66ec3fafccd824f739dadf6f74b167;hp=ac756b29089e501eae8f4158395649aa0c35e904;hpb=bb4be150c66c9606847a7b2e00b40f54f9ea9203;p=packages%2Fgaleon.git

diff --git a/galeon.spec b/galeon.spec
index ac756b2..4dc6fd9 100644
--- a/galeon.spec
+++ b/galeon.spec
@@ -1,61 +1,70 @@
 #
 # 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.
+%bcond_with	nautilus	# disable nautilus view
+%bcond_with	gcc2		# compile using gcc2 to get working gcc2-compiled java
+				# plugin (better get gcc3-compiled one).
+				# Flash plugin seems to still not work, use
+				# mozilla instead. To compile wit this option, You
+				# have to install mozilla compiled with gcc2.
 #
-%define		minmozver	1.5b
-%define		snap	20030905
+%define		minmozver	5:1.7
+%define		snap	20040117
 
 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.9
-Release:	3
+Version:	2.0.1
+Release:	1
 Epoch:		2
 License:	GPL
 Group:		X11/Applications/Networking
+Source0:	http://dl.sourceforge.net/galeon/%{name}-%{version}.tar.bz2
+# Source0-md5:	34d6e3a6ee78f9e4d12736e5d81b462b
 #Source0:	%{name}-%{version}-%{snap}.tar.bz2
-Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
-# Source0-md5:	f948047373884a0dc8d841930d11680c
 Source1:	%{name}-config-tool.1
-URL:		http://galeon.sourceforge.net/
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-history-xml.patch
-BuildRequires:	GConf2-devel >= 2.0.0
-BuildRequires:	ORBit2-devel >= 2.7.5-1
-BuildRequires:	autoconf
+Patch1:		%{name}-home_etc.patch
+Patch2:		%{name}-po.patch
+Patch3:		%{name}-mozilla.patch
+URL:		http://galeon.sourceforge.net/
+BuildRequires:	GConf2-devel >= 2.4.0
+BuildRequires:	ORBit2-devel >= 2.8.3
+BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-vfs2-devel >= 2.0.0
-BuildRequires:	gtk+2-devel >= 2.0.6
+BuildRequires:	glib2-devel >= 1:2.4.4
+BuildRequires:	gnome-desktop-devel >= 2.9.91
+BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
+BuildRequires:	gtk+2-devel >= 2:2.4.4
 BuildRequires:	intltool
-BuildRequires:	libbonobo-devel >= 2.3.1-4
-BuildRequires:	libbonoboui-devel >= 2.3.3-2
-BuildRequires:	libglade2-devel >= 2.0.0
-BuildRequires:	libgnomeui-devel >= 2.3.3.1-2
+BuildRequires:	libbonoboui-devel >= 2.4.0
+BuildRequires:	libglade2-devel >= 1:2.4.0
+BuildRequires:	libgnomeui-devel >= 2.6.0
 BuildRequires:	libstdc++-devel
-BuildRequires:	libxml2-devel >= 2.4.0
+BuildRequires:	libtool
+BuildRequires:	libxml2-devel >= 2.6.6
 BuildRequires:	mozilla-devel >= %{minmozver}
-BuildRequires:	nautilus-devel >= 2.3.7-3
-BuildRequires:	openssl-devel >= 0.9.7c
+%{?with_nautilus:BuildRequires:	nautilus-devel >= 2.4.0}
+BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.1.4
-BuildRequires:	rpm-build >= 4.1-10
-Requires(post):	GConf2
-Requires(post):	mozilla
-Requires(post):	scrollkeeper
-Requires:	libbonobo >= 2.3.1-4
-Requires:	mozilla = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla)
+Requires(post,preun):	GConf2
+Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	scrollkeeper
+Requires:	glib2 >= 1:2.4.4
+Requires:	gtk+2 >= 2:2.4.4
+Requires:	libbonobo >= 2.4.0
+Requires:	mozilla-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
+Provides:	wwwbrowser
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # can be provided by mozilla or mozilla-embedded
 %define		_noautoreqdep	libgtkembedmoz.so libgtksuperwin.so libxpcom.so
 
-%if %{?_with_gcc2:1}%{!?_with_gcc2:0}
+%if %{with gcc2}
 %define         __cc            gcc2
 %define         __cxx           gcc2
 %endif
@@ -74,6 +83,8 @@ O galeon 
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 # regenerate - didn't compile with ORBit2 2.7.2
 cd idl
@@ -82,24 +93,21 @@ mv Galeon*.[ch] ../src
 
 %build
 rm -f missing
-glib-gettextize --copy --force
-intltoolize --copy --force
+cp /usr/share/automake/mkinstalldirs .
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
-	--with-mozilla-libs=%{_libdir} \
-	--with-mozilla-includes=%{_includedir}/mozilla \
-	--with-mozilla-home=%{_libdir}/mozilla \
-	--enable-nls \
-	--disable-included-gettext \
 	--disable-schemas-install \
-	--disable-werror \
-	--enable-gconf-source=%{_sysconfdir}/gconf/schemas \
+	%if %{with nautilus}
 	--enable-nautilus-view=yes
-
+	%else
+	--enable-nautilus-view=no
+	%endif
 %{__make}
 
 %install
@@ -111,7 +119,10 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man1
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/*.la
+# No components installed now.
+#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/*.la
+
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 # galeon-2.0.mo, but gnome/help/galeon
 %find_lang galeon-2.0 --with-gnome --all-name
@@ -120,16 +131,21 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/*.la
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/scrollkeeper-update
-%gconf_schema_install
+%scrollkeeper_update_post
+%gconf_schema_install galeon.schemas
+%update_desktop_database_post
+
+%preun
+%gconf_schema_uninstall galeon.schemas
 
-%postun -p /usr/bin/scrollkeeper-update
+%postun
+%scrollkeeper_update_postun
+%update_desktop_database_postun
 
 %files -f galeon-2.0.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README*
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/%{name}
 %{_libdir}/bonobo/servers/*
 %{_datadir}/galeon
 %{_desktopdir}/*