- updated to 2.20.2

- use better way to fix locale name
- use --with-omf

Changed files:
    gnome-desktop.spec -> 1.116

diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index bda1304173aa7ea726c1494564f509b90f87ad3e..aa4246f9cdeb8e840016499499ff1762aacb2673 100644 (file)
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,12 +1,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
@@ -22,8 +22,10 @@ BuildRequires:       intltool >= 0.36.1
 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}
@@ -104,6 +106,9 @@ Dokumentacja API gnome-desktop.
 %patch0 -p1
 %patch1 -p1
 
+sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
+mv po/sr\@{Latn,latin}.po
+
 %build
 %{__gtkdocize}
 %{__intltoolize}
@@ -129,9 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 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@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
@@ -152,9 +155,6 @@ rm -fr $RPM_BUILD_ROOT
 %{_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