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

[megabajt]

Author: megabajt                     Date: Tue Nov 27 20:15:09 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-desktop.spec (1.115 -> 1.116) 

---- Diffs:

================================================================
Index: SPECS/gnome-desktop.spec
diff -u SPECS/gnome-desktop.spec:1.115 SPECS/gnome-desktop.spec:1.116
--- SPECS/gnome-desktop.spec:1.115	Mon Nov  5 00:22:29 2007
+++ SPECS/gnome-desktop.spec	Tue Nov 27 21:15:04 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-desktop
-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-desktop/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	19912d1e1743960ebf824684cdf8f097
+# Source0-md5:	fa6bfd95606a34fb381a233082ddd5ac
 Source1:	pld-logo.svg
 Patch0:		%{name}-crystalsvg.patch
 Patch1:		%{name}-recently-used-apps.patch
@@ -23,8 +23,10 @@
 BuildRequires:	libgnomeui-devel >= 2.20.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
+BuildRequires:	sed >= 4.0
 BuildRequires:	startup-notification-devel >= 0.8
 Requires(post,postun):	scrollkeeper
 Requires:	%{name}-libs = %{version}-%{release}
@@ -105,6 +107,9 @@
 %patch0 -p1
 %patch1 -p1
 
+sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
+mv po/sr\@{Latn,latin}.po
+
 %build
 %{__gtkdocize}
 %{__intltoolize}
@@ -130,9 +135,7 @@
 rm -rf $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.png
 install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.svg
 
-[ -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 -fr $RPM_BUILD_ROOT
@@ -153,9 +156,6 @@
 %{_mandir}/man1/gnome-about.1*
 %{_datadir}/gnome-about
 %{_pixmapsdir}/*
-%{_omf_dest_dir}/fdl
-%{_omf_dest_dir}/gpl
-%{_omf_dest_dir}/lgpl
 %{_desktopdir}/gnome-about.desktop
 
 %files libs
@@ -183,6 +183,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.116  2007-11-27 20:15:04  megabajt
+- updated to 2.20.2
+- use better way to fix locale name
+- use --with-omf
+
 Revision 1.115  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-desktop.spec?r1=1.115&r2=1.116&f=u