From 8eea9e29ed4a1b0ce799b40dc6a0f0bcde32bdc027f3e2fab722f7900234ffe4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 21 Jan 2010 10:16:11 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/gnome-desktop revision 60.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=259f7dface50c1f718732ecdd7270452 --- baselibs.conf | 2 +- gnome-desktop-2.29.4.tar.bz2 | 3 --- gnome-desktop-2.29.5.tar.bz2 | 3 +++ gnome-desktop.changes | 11 +++++++++++ gnome-desktop.spec | 27 +++++++++++++-------------- 5 files changed, 28 insertions(+), 18 deletions(-) delete mode 100644 gnome-desktop-2.29.4.tar.bz2 create mode 100644 gnome-desktop-2.29.5.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index c7cf96d..fcc762a 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ gnome-desktop -libgnome-desktop-2-11 +libgnome-desktop-2-17 obsoletes "gnome-desktop- <= " provides "gnome-desktop- = " diff --git a/gnome-desktop-2.29.4.tar.bz2 b/gnome-desktop-2.29.4.tar.bz2 deleted file mode 100644 index 9267eea..0000000 --- a/gnome-desktop-2.29.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25e016d9ac169bf96f2c0b9ee2d44e91c889861969c0d58c5c77ec288d012963 -size 1616707 diff --git a/gnome-desktop-2.29.5.tar.bz2 b/gnome-desktop-2.29.5.tar.bz2 new file mode 100644 index 0000000..e779a35 --- /dev/null +++ b/gnome-desktop-2.29.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10f04531fd2aa7ad0a8a3f122f9f43e13b801400cb2a7fdd7c6179354a19fa9b +size 1613434 diff --git a/gnome-desktop.changes b/gnome-desktop.changes index bdc1e75..032340c 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jan 13 06:13:01 CET 2010 - captain.magnus@opensuse.org + +- Update to version 2.29.5: + + Bump library soname since ABI was broken in 2.29.4 +- Rename libgnome-desktop-2-11 subpackage to libgnome-desktop-2-17, + following soname change. +- Update the way we remove the ig locale on old versions of + openSUSE. +- Package baselibs.conf + ------------------------------------------------------------------- Wed Dec 23 10:22:42 CET 2009 - vuntz@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 678afa0..f1e43f3 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -1,7 +1,7 @@ # -# spec file for package gnome-desktop (Version 2.29.4) +# spec file for package gnome-desktop (Version 2.29.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,14 @@ Name: gnome-desktop -Version: 2.29.4 +Version: 2.29.5 Release: 1 License: GFDLv1.1 ; GPLv2+ ; LGPLv2.1+ Summary: The GNOME Desktop API Library Url: http://www.gnome.org Group: System/GUI/GNOME Source: %{name}-%{version}.tar.bz2 +Source99: baselibs.conf # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch1: X-KDE-SubstituteUID.dif # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches @@ -55,13 +56,13 @@ Also contained here are documents installed as part of the core GNOME distribution: the GPL, GNOME's .desktop files, the gnome-about program, some man pages, and GNOME's core graphics files and icons. -%package -n libgnome-desktop-2-11 +%package -n libgnome-desktop-2-17 License: GFDLv1.1 ; GPLv2+ ; LGPLv2.1+ Summary: The GNOME Desktop API Library Group: System/GUI/GNOME Requires: %{name}-lang = %{version} -%description -n libgnome-desktop-2-11 +%description -n libgnome-desktop-2-17 This package contains the libgnome-desktop library that contains APIs that really belong in libgnome/libgnomeui but have not seen enough testing or development to be considered stable. Use them at your own @@ -77,7 +78,7 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME Requires: gconf2-devel Requires: gtk2-devel -Requires: libgnome-desktop-2-11 = %{version} +Requires: libgnome-desktop-2-17 = %{version} Requires: startup-notification-devel Obsoletes: gnome-desktop-doc <= 2.25.90 Provides: gnome-desktop-doc = 2.25.90 @@ -105,6 +106,9 @@ make %{?jobs:-j%jobs} %install %makeinstall +%if 0%{?suse_version} <= 1110 +%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* +%endif %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif @@ -119,9 +123,9 @@ make %{?jobs:-j%jobs} %clean rm -rf %{buildroot} -%post -n libgnome-desktop-2-11 -p /sbin/ldconfig +%post -n libgnome-desktop-2-17 -p /sbin/ldconfig -%postun -n libgnome-desktop-2-11 -p /sbin/ldconfig +%postun -n libgnome-desktop-2-17 -p /sbin/ldconfig %files %defattr (-, root, root) @@ -133,18 +137,13 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/*.xpm %doc %{_mandir}/man?/*.* -%files -n libgnome-desktop-2-11 +%files -n libgnome-desktop-2-17 %defattr(-, root, root) %doc COPYING.LIB %{_datadir}/libgnome-desktop %{_libdir}/*.so.* %files lang -f %{name}-2.0.lang -## ha/ig does not exist in Factory currently -##%if %suse_version <= 1110 -# exclude locales which don't exist on old versions of openSUSE -%exclude %{_datadir}/locale/ig/LC_MESSAGES/* -##%endif %files devel %defattr (-, root, root)