X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=galeon.spec;h=424ee6a295a5b7a6c8b8369f5f0fcd6c43f2ef8c;hb=e1860ed57a193706f3b82e2304ce3f2bd9afc8d4;hp=0c4758b6e5f75019ac0dece7468b991d25c7a567;hpb=2d00a7ad09b35b47a546a9c9400629312b935d1a;p=packages%2Fgaleon.git

diff --git a/galeon.spec b/galeon.spec
index 0c4758b..424ee6a 100644
--- a/galeon.spec
+++ b/galeon.spec
@@ -1,33 +1,31 @@
 #
 # Conditional build:
-%bcond_with	nautilus	# disable nautilus view
+%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.21
-Release:	3
+Version:	2.0.5
+Release:	4
 Epoch:		2
 License:	GPL
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/galeon/%{name}-%{version}.tar.bz2
-# Source0-md5:	5106e037bb52bdb234b3fc09c1e0a3f3
-#Source0:	%{name}-%{version}-%{snap}.tar.bz2
+# Source0-md5:	bbddb89ad1ba08a62e03bceab5a38d93
 Source1:	%{name}-config-tool.1
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-home_etc.patch
-Patch2:		%{name}-po.patch
-Patch3:		%{name}-mozilla.patch
+Patch2:		%{name}-mozilla.patch
+Patch3:		%{name}-build_fix.patch
+Patch4:		%{name}-ti-agent.patch
+Patch5:		%{name}-agent.patch
 URL:		http://galeon.sourceforge.net/
 BuildRequires:	GConf2-devel >= 2.4.0
 BuildRequires:	ORBit2-devel >= 2.8.3
@@ -36,6 +34,7 @@ BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	gettext-devel
 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
@@ -45,37 +44,45 @@ 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 >= 4.4.9-56
+BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.1.4
-Requires(post,preun):	GConf2
+BuildRequires:	sed >= 4.0
 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-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
+%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
@@ -83,6 +90,14 @@ O galeon 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%if "%{pld_release}" == "ti"
+%patch4 -p1
+%else
+%patch5 -p1
+%endif
+
+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
@@ -90,7 +105,6 @@ orbit-idl-2 -I /usr/share/idl/bonobo-2.0 -I /usr/share/idl/bonobo-activation-2.0
 mv Galeon*.[ch] ../src
 
 %build
-rm -f missing
 cp /usr/share/automake/mkinstalldirs .
 %{__glib_gettextize}
 %{__intltoolize}
@@ -120,10 +134,8 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
 # 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
+%find_lang galeon-2.0 --with-gnome --with-omf --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -146,11 +158,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %{_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/*