From 4c162d06fed0e1ed25bf429d32a7ac9d6cb6f3b37707edcb3e2187aca814383f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 2 Apr 2008 21:40:59 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-desktop?expand=0&rev=21 --- gnome-desktop.changes | 5 +++++ gnome-desktop.spec | 22 ++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 5997269..7c26b68 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 1 19:48:28 CEST 2008 - vuntz@suse.de + +- Remove uz@cyrillic workaround (see bnc#372941) + ------------------------------------------------------------------- Fri Mar 14 04:53:15 CET 2008 - maw@suse.de diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 30ffc3e..9421709 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -17,7 +17,7 @@ License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 o Group: System/GUI/GNOME Obsoletes: gnome-core Version: 2.22.0 -Release: 1 +Release: 9 Summary: The GNOME Desktop API Library Source: %{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -51,6 +51,7 @@ Authors: Anders Carlsson %package -n libgnome-desktop-2-2 +License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 or later; LGPL v2.1 or later Summary: The GNOME Desktop API Library Group: System/GUI/GNOME Requires: %{name} >= %{version} @@ -76,6 +77,7 @@ Authors: Anders Carlsson %package devel +License: LGPL v2.1 or later Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/GNOME Requires: %{name} = %{version} gtk2-devel libgnomeui-devel libopenssl-devel startup-notification-devel @@ -87,6 +89,7 @@ to develop applications that require these. %package doc +License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 or later; LGPL v2.1 or later Summary: Additional Package Documentation. Group: System/GUI/GNOME Requires: %{name} = %{version} @@ -118,8 +121,6 @@ Authors: %patch1 %patch2 -p0 #%patch3 -p1 -### rename uz@cyrillic uz@Cyrl po/uz@cyrillic.* -### sed -i "/ALL_LINGUAS/s/ uz@cyrillic / uz@Cyrl /" configure.in %build autoreconf -f -i @@ -133,11 +134,6 @@ make %{?jobs:-j%jobs} %install %makeinstall -# /usr/share/locale/uz@cyrillic isn't owned by any package, so rename it -# to uz@Cyrl. -pushd $RPM_BUILD_ROOT/%{_datadir}/locale -mv uz@cyrillic uz@Cyrl -popd %find_lang %{name}-2.0 %find_lang fdl %{name}-2.0.lang # This no longer seems to exist. @@ -183,6 +179,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/gnome-desktop %changelog +* Tue Apr 01 2008 vuntz@suse.de +- Remove uz@cyrillic workaround (see bnc#372941) * Fri Mar 14 2008 maw@suse.de - Update to version 2.22.0: + Updated translations. @@ -278,12 +276,12 @@ rm -rf $RPM_BUILD_ROOT * Tue Nov 21 2006 sbrabec@suse.cz - Do not explicitly require mDNSResponder-lib blocking avahi compat package. -* Wed Nov 15 2006 jimmyk@suse.de +* Thu Nov 16 2006 jimmyk@suse.de - Updated recently-used-apps.patch to be compatible with new recently-used format, BNC #221392. * Fri Oct 13 2006 ro@suse.de - added gnome-doc-utils-devel to buildreq -* Mon Oct 02 2006 jhargadon@suse.de +* Tue Oct 03 2006 jhargadon@suse.de - update to version 2.16.1 - updated translations * Thu Sep 14 2006 jhargadon@suse.de @@ -324,7 +322,7 @@ rm -rf $RPM_BUILD_ROOT - Reduce BuildRequires. * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Nov 30 2005 gekker@suse.de +* Thu Dec 01 2005 gekker@suse.de - Update to version 2.12.2 * Wed Nov 16 2005 sbrabec@suse.cz - Fixed X-KDE-SubstituteUID patch for commands with arguments @@ -358,7 +356,7 @@ rm -rf $RPM_BUILD_ROOT - Update to version 2.10.0 (GNOME 2.10). * Thu Mar 03 2005 gekker@suse.de - update to version 2.9.92 -* Thu Feb 10 2005 gekker@suse.de +* Fri Feb 11 2005 gekker@suse.de - Update to version 2.9.91 * Tue Feb 08 2005 sbrabec@suse.cz - Changed Categories for gnome-about (#50440).