SPECS: gnome-applet-deskbar.spec - use better way to fix locale na...

[megabajt]

Author: megabajt                     Date: Sun Nov 11 12:02:26 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use better way to fix locale name
- use --with-omf; new URL

---- Files affected:
SPECS:
   gnome-applet-deskbar.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: SPECS/gnome-applet-deskbar.spec
diff -u SPECS/gnome-applet-deskbar.spec:1.48 SPECS/gnome-applet-deskbar.spec:1.49
--- SPECS/gnome-applet-deskbar.spec:1.48	Mon Nov  5 00:22:29 2007
+++ SPECS/gnome-applet-deskbar.spec	Sun Nov 11 13:02:20 2007
@@ -14,7 +14,7 @@
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.20/%{_realname}-%{version}.tar.bz2
 # Source0-md5:	ba23f3a629b6f7287ff905e76e395466
 Patch0:		%{name}-pyc.patch
-URL:		http://browserbookapp.sourceforge.net/deskbar.html
+URL:		http://raphael.slinckx.net/deskbar/
 BuildRequires:	GConf2-devel >= 2.20.1
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -26,6 +26,8 @@
 BuildRequires:	python-dbus-devel >= 0.80.2
 BuildRequires:	python-gnome-desktop-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
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
@@ -50,6 +52,9 @@
 %setup -q -n %{_realname}-%{version}
 %patch0 -p1
 
+sed -i -e s#sr\@Latn#sr\@latin# po/LINGUAS
+mv -f po/sr\@{Latn,latin}.po
+
 %build
 %{__intltoolize}
 %{__aclocal} -I m4
@@ -73,11 +78,7 @@
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/deskbar/*/*/*.{la,py}
 rm -f $RPM_BUILD_ROOT%{_libdir}/deskbar-applet/modules-2.20-compatible/*.py
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang %{_realname}
-%find_lang deskbar --with-gnome
-cat deskbar.lang >> %{_realname}.lang
+%find_lang %{name} --with-gnome --with-omf --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,7 +95,7 @@
 %scrollkeeper_update_postun
 %update_icon_cache hicolor
 
-%files -f %{_realname}.lang
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %{_sysconfdir}/gconf/schemas/deskbar-applet.schemas
@@ -144,15 +145,6 @@
 %attr(755,root,root) %{py_sitedir}/deskbar/ui/iconentry/*.so
 %attr(755,root,root) %{py_sitedir}/deskbar/core/keybinder/*.so
 %attr(755,root,root) %{py_sitedir}/deskbar/osutils/*.so
-%dir %{_omf_dest_dir}/deskbar
-%{_omf_dest_dir}/deskbar/deskbar-C.omf
-%lang(ca) %{_omf_dest_dir}/deskbar/deskbar-ca.omf
-%lang(en_GB) %{_omf_dest_dir}/deskbar/deskbar-en_GB.omf
-%lang(es) %{_omf_dest_dir}/deskbar/deskbar-es.omf
-%lang(fr) %{_omf_dest_dir}/deskbar/deskbar-fr.omf
-%lang(oc) %{_omf_dest_dir}/deskbar/deskbar-oc.omf
-%lang(sv) %{_omf_dest_dir}/deskbar/deskbar-sv.omf
-%lang(uk) %{_omf_dest_dir}/deskbar/deskbar-uk.omf
 %{_pkgconfigdir}/deskbar-applet.pc
 %{_iconsdir}/hicolor/*/apps/*
 
@@ -162,6 +154,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2007-11-11 12:02:20  megabajt
+- use better way to fix locale name
+- use --with-omf; new URL
+
 Revision 1.48  2007-11-04 23:22:29  ankry
 - sr at Latn -> sr at latin, rel. 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-applet-deskbar.spec?r1=1.48&r2=1.49&f=u