SPECS: gnome-panel.spec - updated to 2.20.2 - use better way to fi...

Tue Nov 27 21:30:37 CET 2007

Author: megabajt                     Date: Tue Nov 27 20:30:37 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.20.2
- use better way to fix locale name
- use --with-omf

---- Files affected:
SPECS:
   gnome-panel.spec (1.203 -> 1.204) 

---- Diffs:

================================================================
Index: SPECS/gnome-panel.spec
diff -u SPECS/gnome-panel.spec:1.203 SPECS/gnome-panel.spec:1.204

--- SPECS/gnome-panel.spec:1.203	Mon Nov  5 00:57:02 2007
+++ SPECS/gnome-panel.spec	Tue Nov 27 21:30:32 2007
@@ -2,12 +2,12 @@
 Summary:	The core programs for the GNOME GUI desktop environment
 Summary(pl.UTF-8):	Podstawowe programy środowiska graficznego GNOME
 Name:		gnome-panel
-Version:	2.20.1
-Release:	2
+Version:	2.20.2
+Release:	1
 License:	LGPL
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	87ef96c2cbb8ecaa328420c0d31cc4c0
+# Source0-md5:	400924a82c03ec04f7842348625e1f4a
 Patch0:		%{name}-finalize-memleak.patch
 Patch1:		%{name}-no_launchers_on_panel.patch
 URL:		http://www.gnome.org/
@@ -34,8 +34,10 @@
 BuildRequires:	pkgconfig >= 1:0.15.0
 BuildRequires:	python-libxml2 >= 1:2.6.30
 BuildRequires:	rpm-build >= 4.1-10
+BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper >= 0.3.11
+BuildRequires:	sed >= 4.0
 BuildConflicts:	GConf-devel < 1.0.9-7
 Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	scrollkeeper
@@ -123,6 +125,9 @@
 %patch0 -p1
 %patch1 -p1
 
+sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
+mv po/sr\@{Latn,latin}.po
+
 %build
 %{__gnome_doc_prepare}
 %{__gnome_doc_common}
@@ -155,9 +160,7 @@
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --with-gnome --with-omf --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -227,79 +230,6 @@
 %{_sysconfdir}/gconf/schemas/panel-toplevel.schemas
 %{_sysconfdir}/gconf/schemas/window-list.schemas
 %{_sysconfdir}/gconf/schemas/workspace-switcher.schemas
-%dir %{_omf_dest_dir}/clock
-%{_omf_dest_dir}/clock/clock-C.omf
-%lang(ca) %{_omf_dest_dir}/clock/clock-ca.omf
-%lang(de) %{_omf_dest_dir}/clock/clock-de.omf
-%lang(el) %{_omf_dest_dir}/clock/clock-el.omf
-%lang(es) %{_omf_dest_dir}/clock/clock-es.omf
-%lang(fr) %{_omf_dest_dir}/clock/clock-fr.omf
-%lang(it) %{_omf_dest_dir}/clock/clock-it.omf
-%lang(ja) %{_omf_dest_dir}/clock/clock-ja.omf
-%lang(ko) %{_omf_dest_dir}/clock/clock-ko.omf
-%lang(nl) %{_omf_dest_dir}/clock/clock-nl.omf
-%lang(oc) %{_omf_dest_dir}/clock/clock-oc.omf
-%lang(pa) %{_omf_dest_dir}/clock/clock-pa.omf
-%lang(ru) %{_omf_dest_dir}/clock/clock-ru.omf
-%lang(sr) %{_omf_dest_dir}/clock/clock-sr.omf
-%lang(sv) %{_omf_dest_dir}/clock/clock-sv.omf
-%lang(uk) %{_omf_dest_dir}/clock/clock-uk.omf
-%lang(zh_CN) %{_omf_dest_dir}/clock/clock-zh_CN.omf
-%lang(zh_TW) %{_omf_dest_dir}/clock/clock-zh_TW.omf
-%dir %{_omf_dest_dir}/fish
-%{_omf_dest_dir}/fish/fish-C.omf
-%lang(ca) %{_omf_dest_dir}/fish/fish-ca.omf
-%lang(el) %{_omf_dest_dir}/fish/fish-el.omf
-%lang(es) %{_omf_dest_dir}/fish/fish-es.omf
-%lang(fr) %{_omf_dest_dir}/fish/fish-fr.omf
-%lang(it) %{_omf_dest_dir}/fish/fish-it.omf
-%lang(ko) %{_omf_dest_dir}/fish/fish-ko.omf
-%lang(oc) %{_omf_dest_dir}/fish/fish-oc.omf
-%lang(sv) %{_omf_dest_dir}/fish/fish-sv.omf
-%lang(uk) %{_omf_dest_dir}/fish/fish-uk.omf
-%dir %{_omf_dest_dir}/gnome-panel
-%lang(de) %{_omf_dest_dir}/gnome-panel/fish-applet-2-de.omf
-%lang(ja) %{_omf_dest_dir}/gnome-panel/fish-applet-2-ja.omf
-%lang(zh_CN) %{_omf_dest_dir}/gnome-panel/fish-applet-2-zh_CN.omf
-%lang(zh_TW) %{_omf_dest_dir}/gnome-panel/fish-applet-2-zh_TW.omf
-%lang(de) %{_omf_dest_dir}/gnome-panel/window-list-de.omf
-%lang(ja) %{_omf_dest_dir}/gnome-panel/window-list-ja.omf
-%lang(zh_TW) %{_omf_dest_dir}/gnome-panel/window-list-zh_TW.omf
-%lang(de) %{_omf_dest_dir}/gnome-panel/workspace-switcher-de.omf
-%lang(ja) %{_omf_dest_dir}/gnome-panel/workspace-switcher-ja.omf
-%lang(zh_CN) %{_omf_dest_dir}/gnome-panel/workspace-switcher-zh_CN.omf
-%lang(zh_TW) %{_omf_dest_dir}/gnome-panel/workspace-switcher-zh_TW.omf
-%dir %{_omf_dest_dir}/window-list
-%{_omf_dest_dir}/window-list/window-list-C.omf
-%lang(ca) %{_omf_dest_dir}/window-list/window-list-ca.omf
-%lang(de) %{_omf_dest_dir}/window-list/window-list-de.omf
-%lang(el) %{_omf_dest_dir}/window-list/window-list-el.omf
-%lang(es) %{_omf_dest_dir}/window-list/window-list-es.omf
-%lang(fr) %{_omf_dest_dir}/window-list/window-list-fr.omf
-%lang(it) %{_omf_dest_dir}/window-list/window-list-it.omf
-%lang(ko) %{_omf_dest_dir}/window-list/window-list-ko.omf
-%lang(oc) %{_omf_dest_dir}/window-list/window-list-oc.omf
-%lang(pa) %{_omf_dest_dir}/window-list/window-list-pa.omf
-%lang(ru) %{_omf_dest_dir}/window-list/window-list-ru.omf
-%lang(sv) %{_omf_dest_dir}/window-list/window-list-sv.omf
-%lang(uk) %{_omf_dest_dir}/window-list/window-list-uk.omf
-%lang(zh_CN) %{_omf_dest_dir}/window-list/window-list-zh_CN.omf
-%dir %{_omf_dest_dir}/workspace-switcher
-%{_omf_dest_dir}/workspace-switcher/workspace-switcher-C.omf
-%lang(ca) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-ca.omf
-%lang(de) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-de.omf
-%lang(el) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-el.omf
-%lang(es) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-es.omf
-%lang(fr) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-fr.omf
-%lang(it) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-it.omf
-%lang(ko) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-ko.omf
-%lang(nl) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-nl.omf
-%lang(oc) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-oc.omf
-%lang(pa) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-pa.omf
-%lang(ru) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-ru.omf
-%lang(sv) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-sv.omf
-%lang(uk) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-uk.omf
-%lang(vi) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-vi.omf
 
 %files libs
 %defattr(644,root,root,755)
@@ -326,6 +256,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204  2007-11-27 20:30:32  megabajt
+- updated to 2.20.2
+- use better way to fix locale name
+- use --with-omf
+
 Revision 1.203  2007-11-04 23:57:02  ankry
 - sr at Latn -> sr at latin, rel. 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-panel.spec?r1=1.203&r2=1.204&f=u

