- use better way to fix locale name

[packages/galeon.git] / galeon.spec

diff --git a/galeon.spec b/galeon.spec
index 3c0d9e8dff852f8bb95af3c36b57ced7480484f8..7979b758c424658b5976b8ebe123935c3c16e31c 100644 (file)
--- a/galeon.spec
+++ b/galeon.spec
@@ -13,13 +13,13 @@ 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:       2.0.2
-Release:       7
+Version:       2.0.3
+Release:       6
 Epoch:         2
 License:       GPL
 Group:         X11/Applications/Networking
 Source0:       http://dl.sourceforge.net/galeon/%{name}-%{version}.tar.bz2
-# Source0-md5: 43d395aa3e6424d980919942e5499dba
+# Source0-md5: 610fe2258e680f68bdf36ce7c1ba2a24
 Source1:       %{name}-config-tool.1
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-home_etc.patch
@@ -47,6 +47,8 @@ BuildRequires:        libxml2-devel >= 2.6.6
 BuildRequires: xulrunner-devel >= 1.8.0.4
 %{?with_nautilus:BuildRequires:        nautilus-devel >= 2.4.0}
 BuildRequires: pkgconfig
+# 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,postun): desktop-file-utils
@@ -57,6 +59,8 @@ Requires:     gtk+2 >= 2:2.4.4
 Requires:      libbonobo >= 2.4.0
 %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
@@ -87,6 +91,9 @@ O galeon é um browser para o GNOME baseado no mozilla.
 %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
 orbit-idl-2 -I /usr/share/idl/bonobo-2.0 -I /usr/share/idl/bonobo-activation-2.0 Galeon*.idl
@@ -124,7 +131,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
 #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
@@ -149,9 +156,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/galeon
 %{_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/*