From 2c3226b9cb3d2713169365cb42c7776f5e5eac31ee78010803c21d7469542d6b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 18 Dec 2009 12:47:35 +0000 Subject: [PATCH] Accepting request 27015 from GNOME:Factory Copy from GNOME:Factory/pidgin based on submit request 27015 from user vuntz OBS-URL: https://build.opensuse.org/request/show/27015 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=48 --- pidgin.changes | 6 ++++++ pidgin.spec | 10 ++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pidgin.changes b/pidgin.changes index 6c8e956..cf137d8 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 16 14:49:51 CET 2009 - vuntz@opensuse.org + +- Fix build in Factory by not owning /usr/share/locale/ms_MY which + is now owned by the filesystem package. + ------------------------------------------------------------------- Sun Dec 6 03:40:23 CET 2009 - vuntz@opensuse.org diff --git a/pidgin.spec b/pidgin.spec index ce25eae..f0ff233 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -21,8 +21,7 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client Version: 2.6.4 -Release: 1 -# FIXME: remove workaround for ms_MY when https://bugzilla.novell.com/show_bug.cgi?id=561174 is fixed +Release: 2 License: GPLv2+ Group: Productivity/Networking/Instant Messenger Url: http://www.pidgin.im/ @@ -417,13 +416,12 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \ %files -n libpurple-lang -f %{name}.lang %endif %defattr(-, root, root) -# %if %suse_version < 1130 -# Directories not yet created in filesystem, see https://bugzilla.novell.com/show_bug.cgi?id=561174 +# These locales are not yet included in respective products: +%if %suse_version < 1130 %dir %{_datadir}/locale/ms_MY %dir %{_datadir}/locale/ms_MY/LC_MESSAGES -# %endif +%endif %if %suse_version < 1110 -# These locales are not yet included in respective products: %dir %{_datadir}/locale/sr@latin %dir %{_datadir}/locale/sr@latin/LC_MESSAGES %endif