X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=galeon.spec;h=7979b758c424658b5976b8ebe123935c3c16e31c;hb=2e05a0383a916c299ffd6bbe6bfe871ef5ddc97f;hp=e4ee3012a791e41f84436d9af26c000151fd03e3;hpb=a316f6e5a0035a635bedaf5b7ea43d1a5717b5c0;p=packages%2Fgaleon.git

diff --git a/galeon.spec b/galeon.spec
index e4ee301..7979b75 100644
--- a/galeon.spec
+++ b/galeon.spec
@@ -1,33 +1,31 @@
 #
 # Conditional build:
-%bcond_without 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.
+%bcond_with	nautilus	# enable 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	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Á÷ÀÀÆ÷
+Summary(pl.UTF-8):	Galeon - przeglądarka WWW dla GNOME
+Summary(pt_BR.UTF-8):	O galeon é um browser para o GNOME baseado no mozilla
+Summary(zh_CN.UTF-8):	基于Gecko的GNOME流览器
 Name:		galeon
-Version:	1.3.18
-Release:	1
+Version:	2.0.3
+Release:	6
 Epoch:		2
 License:	GPL
 Group:		X11/Applications/Networking
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-# Source0-md5:	d04164ebf26c65fdfd23fc1278edfce1
-#Source0:	%{name}-%{version}-%{snap}.tar.bz2
+Source0:	http://dl.sourceforge.net/galeon/%{name}-%{version}.tar.bz2
+# Source0-md5:	610fe2258e680f68bdf36ce7c1ba2a24
 Source1:	%{name}-config-tool.1
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-home_etc.patch
 Patch2:		%{name}-po.patch
 Patch3:		%{name}-mozilla.patch
+Patch4:		%{name}-agent.patch
 URL:		http://galeon.sourceforge.net/
 BuildRequires:	GConf2-devel >= 2.4.0
 BuildRequires:	ORBit2-devel >= 2.8.3
@@ -36,7 +34,8 @@ BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.4.4
-BuildRequires:	gnome-vfs2-devel >= 2.4.0
+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:	libbonoboui-devel >= 2.4.0
@@ -45,36 +44,44 @@ BuildRequires:	libgnomeui-devel >= 2.6.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2.6.6
-BuildRequires:	mozilla-devel >= %{minmozver}
+BuildRequires:	xulrunner-devel >= 1.8.0.4
 %{?with_nautilus:BuildRequires:	nautilus-devel >= 2.4.0}
 BuildRequires:	pkgconfig
-BuildRequires:	rpm-build >= 4.1-10
+# support for --with-omf in find_lang.sh
+BuildRequires:	rpm-build >= 4.4.9-10
+BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.1.4
-Requires(post):	GConf2
+Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
 Requires:	glib2 >= 1:2.4.4
 Requires:	gtk+2 >= 2:2.4.4
 Requires:	libbonobo >= 2.4.0
-Requires:	mozilla = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla)
+%requires_eq_to	xulrunner xulrunner-devel
+Provides:	wwwbrowser
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # can be provided by mozilla or mozilla-embedded
 %define		_noautoreqdep	libgtkembedmoz.so libgtksuperwin.so libxpcom.so
+# we have strict deps for it
+%define		_noautoreq	libxpcom.so
 
 %if %{with gcc2}
-%define         __cc            gcc2
-%define         __cxx           gcc2
+%define		__cc		gcc2
+%define		__cxx		gcc2
 %endif
 
 %description
 GNOME browser based on Gecko (Mozilla rendering engine).
 
-%description -l pl
-Galeon jest przegl±dark± WWW bazuj±c± na Gecko (mechanizmie
+%description -l pl.UTF-8
+Galeon jest przeglądarką WWW bazującą na Gecko (mechanizmie
 interpretacji stron Mozilli).
 
-%description -l pt_BR
-O galeon é um browser para o GNOME baseado no mozilla.
+%description -l pt_BR.UTF-8
+O galeon é um browser para o GNOME baseado no mozilla.
 
 %prep
 %setup -q
@@ -82,6 +89,10 @@ O galeon 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+
+sed -i -e s#sr\@Latn#sr\@latin# configure.in
+mv po/sr\@{Latn,latin}.po
 
 # regenerate - didn't compile with ORBit2 2.7.2
 cd idl
@@ -91,8 +102,8 @@ mv Galeon*.[ch] ../src
 %build
 rm -f missing
 cp /usr/share/automake/mkinstalldirs .
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
@@ -105,7 +116,6 @@ intltoolize --copy --force
 	%else
 	--enable-nautilus-view=no
 	%endif
-
 %{__make}
 
 %install
@@ -117,39 +127,37 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man1
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/*.la
-
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+# No components installed now.
+#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/*.la
 
 # galeon-2.0.mo, but gnome/help/galeon
-%find_lang galeon-2.0 --with-gnome --all-name
+%find_lang galeon-2.0 --with-gnome --with-omf --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-umask 022
-/usr/bin/scrollkeeper-update
-%gconf_schema_install
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
+%scrollkeeper_update_post
+%gconf_schema_install galeon.schemas
+%update_desktop_database_post
+
+%preun
+%gconf_schema_uninstall galeon.schemas
 
 %postun
-umask 022
-/usr/bin/scrollkeeper-update
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
+%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}/*
+%{_desktopdir}/*.desktop
 %{_datadir}/gnome-2.0/ui/*.xml
-%{_omf_dest_dir}/%{name}
 %{_datadir}/sounds/galeon
 %{_pixmapsdir}/*
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/gconf/schemas/galeon.schemas
 %{_sysconfdir}/sound/events/*
 %{_mandir}/man1/*