SPECS: epiphany.spec, epiphany-extensions.spec - use better way to...

[megabajt]

Author: megabajt                     Date: Sat Nov 10 14:47:16 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use better way to fix locale name
- use --with-omf
- release 4

---- Files affected:
SPECS:
   epiphany.spec (1.161 -> 1.162) , epiphany-extensions.spec (1.90 -> 1.91) 

---- Diffs:

================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.161 SPECS/epiphany.spec:1.162
--- SPECS/epiphany.spec:1.161	Sun Nov  4 18:06:48 2007
+++ SPECS/epiphany.spec	Sat Nov 10 15:47:11 2007
@@ -9,10 +9,10 @@
 Summary(pl.UTF-8):	Epiphany - przeglądarka WWW dla GNOME
 Name:		epiphany
 Version:	2.20.1
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/2.20/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.20/%{name}-%{version}.tar.bz2
 # Source0-md5:	bacb5c7f1a421f6d5adbec35d4cab3ea
 Patch0:		%{name}-pld-homepage.patch
 Patch1:		%{name}-configure.patch
@@ -46,6 +46,8 @@
 BuildRequires:	pkgconfig
 BuildRequires:	python-gnome-devel >= 2.20.0
 BuildRequires:	python-pygtk-devel >= 2:2.12.0
+# support for --with-omf in find_lang.sh
+BuildRequires:	rpm-build >= 4.4.9-10
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
 BuildRequires:	startup-notification-devel >= 0.8
@@ -123,6 +125,9 @@
 %patch1 -p1
 %patch2 -p1
 
+sed -i -e s#sr\@Latn#sr\@latin# po/LINGUAS
+mv po/sr\@{Latn,latin}.po
+
 %build
 %{__gnome_doc_prepare}
 %{__gnome_doc_common}
@@ -154,9 +159,7 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/%{basever}/plugins/*.la
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -193,7 +196,6 @@
 %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-pango.schemas
 %{_sysconfdir}/gconf/schemas/epiphany.schemas
-%{_omf_dest_dir}/*
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/%{basever}
 %dir %{_libdir}/%{name}/%{basever}/extensions
@@ -220,6 +222,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.162  2007/11/10 14:47:11  megabajt
+- use better way to fix locale name
+- use --with-omf
+- release 4
+
 Revision 1.161  2007/11/04 17:06:48  ankry
 - sr at Latn -> sr at latin, rel. 3
 

================================================================
Index: SPECS/epiphany-extensions.spec
diff -u SPECS/epiphany-extensions.spec:1.90 SPECS/epiphany-extensions.spec:1.91
--- SPECS/epiphany-extensions.spec:1.90	Sun Nov  4 18:06:48 2007
+++ SPECS/epiphany-extensions.spec	Sat Nov 10 15:47:11 2007
@@ -4,10 +4,10 @@
 Summary(pl.UTF-8):	Zbiór rozszerzeń dla Epiphany
 Name:		epiphany-extensions
 Version:	2.20.1
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/2.20/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.20/%{name}-%{version}.tar.bz2
 # Source0-md5:	cd8a247d81960217df4d7c8edfe9fbf8
 URL:		http://www.gnome.org/projects/epiphany/
 BuildRequires:	autoconf >= 2.57
@@ -25,6 +25,8 @@
 BuildRequires:	pcre-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python-gnome-devel >= 2.20.0
+# support for --with-omf in find_lang.sh
+BuildRequires:	rpm-build >= 4.4.9-10
 BuildRequires:	rpmbuild(macros) >= 1.198
 BuildRequires:	xulrunner-devel >= 1.8.0.4
 Requires(post,postun):	scrollkeeper
@@ -50,6 +52,9 @@
 %prep
 %setup -q
 
+sed -i -e s#sr\@Latn#sr\@latin# po/LINGUAS
+mv po/sr\@{Latn,latin}.po
+
 %build
 %{__intltoolize}
 %{__libtoolize}
@@ -70,11 +75,7 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/%{basever}/extensions/{,libepilicious/}*.{la,py}
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang %{name}-%{basever}
-%find_lang %{name} --with-gnome
-cat %{name}.lang >> %{name}-%{basever}.lang
+%find_lang %{name} --with-gnome --with-omf --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,7 +92,7 @@
 %postun
 %scrollkeeper_update_postun
 
-%files -f %{name}-%{basever}.lang
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/epiphany/%{basever}/extensions/*.so*
@@ -102,7 +103,6 @@
 %{_datadir}/%{name}
 %{_datadir}/epiphany/icons/hicolor/*/*/*.png
 %{_datadir}/epiphany/icons/hicolor/*/*/*.svg
-%{_omf_dest_dir}/%{name}
 %{_sysconfdir}/gconf/schemas/epilicious.schemas
 %{_sysconfdir}/gconf/schemas/smart-bookmarks.schemas
 
@@ -112,6 +112,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2007/11/10 14:47:11  megabajt
+- use better way to fix locale name
+- use --with-omf
+- release 4
+
 Revision 1.90  2007/11/04 17:06:48  ankry
 - sr at Latn -> sr at latin, rel. 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/epiphany.spec?r1=1.161&r2=1.162&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/epiphany-extensions.spec?r1=1.90&r2=1.91&f=u