From b60063a63f8bbb3bb0afbabce6ec6d378acd0dea06bad9e80dfcbaab43f30263 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 15 Aug 2007 18:23:35 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-desktop?expand=0&rev=12 --- gnome-desktop.changes | 6 ++++++ gnome-desktop.spec | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 82bb53b..b3834ec 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 14 15:32:15 CEST 2007 - maw@suse.de + +- Rename the uz@cyrillic locale directory to uz@Cyrl to avoid + unowned directories. + ------------------------------------------------------------------- Wed Aug 8 01:12:54 CEST 2007 - maw@suse.de diff --git a/gnome-desktop.spec b/gnome-desktop.spec index a3d3bcf..b43fe74 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -16,7 +16,7 @@ License: GNU Free Documentation License, Version 1.1 (GFDL 1.1), GPL v2 o Group: System/GUI/GNOME Obsoletes: gnome-core Version: 2.19.6 -Release: 4 +Release: 7 Summary: The GNOME Desktop API Library Source: %{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -90,6 +90,8 @@ 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 @@ -102,6 +104,11 @@ 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. @@ -113,7 +120,7 @@ make %{?jobs:-j%jobs} %fdupes $RPM_BUILD_ROOT %clean -# rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -147,6 +154,9 @@ make %{?jobs:-j%jobs} %{_datadir}/gtk-doc/html/gnome-desktop %changelog +* Tue Aug 14 2007 - maw@suse.de +- Rename the uz@cyrillic locale directory to uz@Cyrl to avoid + unowned directories. * Wed Aug 08 2007 - maw@suse.de - Use %%fdupes - Split off a -lang subpackage