diff --git a/gnome-desktop-2.25.90.tar.bz2 b/gnome-desktop-2.25.90.tar.bz2 deleted file mode 100644 index 8a53e53..0000000 --- a/gnome-desktop-2.25.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c77aa668046a92f6923bfbe5b299185581d8353eeff9384f66c85d35e106159 -size 3086214 diff --git a/gnome-desktop-2.25.91.tar.bz2 b/gnome-desktop-2.25.91.tar.bz2 new file mode 100644 index 0000000..db1aa92 --- /dev/null +++ b/gnome-desktop-2.25.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae730d7af5bec8c6f9c9b9152f67b3dae79306a9bfc11195ca349f5385742dac +size 3171102 diff --git a/gnome-desktop.changes b/gnome-desktop.changes index bd9f20d..40ecc1a 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Feb 17 11:44:12 CET 2009 - mboman@suse.de + +- Add Obsoletes/Provides for merged -doc package + +------------------------------------------------------------------- +Tue Feb 17 09:59:01 CET 2009 - mboman@suse.de + +- Update to version 2.25.91: + + Translation updates +- Merge -doc into -devel since it only contained gtk-doc +- Remove gnome-common, gtk-doc and scrollkeeper from BuildRequires + ------------------------------------------------------------------- Thu Feb 5 14:08:29 EST 2009 - mboman@suse.de diff --git a/gnome-desktop.spec b/gnome-desktop.spec index bdc3d72..994bd0b 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-desktop (Version 2.25.90) +# spec file for package gnome-desktop (Version 2.25.91) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,18 +21,15 @@ Name: gnome-desktop BuildRequires: fdupes BuildRequires: gconf2-devel -BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel -BuildRequires: gtk-doc BuildRequires: gtk2-devel BuildRequires: intltool -BuildRequires: scrollkeeper BuildRequires: startup-notification-devel BuildRequires: update-desktop-files License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Obsoletes: gnome-core -Version: 2.25.90 +Version: 2.25.91 Release: 1 Summary: The GNOME Desktop API Library Source: %{name}-%{version}.tar.bz2 @@ -98,6 +95,8 @@ License: LGPL v2.1 or later Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME Requires: %{name} = %{version} gconf2-devel gtk2-devel startup-notification-devel +Obsoletes: gnome-desktop-doc <= 2.25.90 +Provides: gnome-desktop-doc = 2.25.90 %description devel This package contains all necessary include files and libraries needed @@ -105,32 +104,6 @@ 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} - -%description doc -This package contains documentation for 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 risk. - -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. - - - -Authors: --------- - Elliot Lee - George Lebl - John Ellis - Havoc Pennington - Anders Carlsson - %lang_package %prep %setup -q @@ -140,7 +113,7 @@ Authors: %patch5 -p0 %build -autoreconf -f -i +#autoreconf -f -i export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --with-pic\ --disable-static\ @@ -192,12 +165,19 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %{_libdir}/*.so %{_includedir}/gnome-desktop-2.0 - -%files doc -%defattr (-, root, root) +# Own these repositories to not depend on gtk-doc while building: +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/gnome-desktop %changelog +* Tue Feb 17 2009 mboman@suse.de +- Add Obsoletes/Provides for merged -doc package +* Tue Feb 17 2009 mboman@suse.de +- Update to version 2.25.91: + + Translation updates +- Merge -doc into -devel since it only contained gtk-doc +- Remove gnome-common, gtk-doc and scrollkeeper from BuildRequires * Thu Feb 05 2009 mboman@suse.de - Update to version 2.25.90: + GnomeRR: Create a backup file of the configuration when saving @@ -217,7 +197,7 @@ rm -rf $RPM_BUILD_ROOT + GnomeBG: reorganize code a bit + GnomeBG: add fading API to support fading between two backgrounds + Translation updates -* Sat Jan 31 2009 vuntz@novell.com +* Sun Feb 01 2009 vuntz@novell.com - Update gnome-desktop-fate300461-desktop-gettext.patch: the inline translations were ignored if they were not matching the first language returned by g_get_language_names(), and gettext was @@ -229,10 +209,10 @@ rm -rf $RPM_BUILD_ROOT handled with %%suse_update_desktop_file - Sanitize BuildRequires and Requires. - Minor tweaks. -* Thu Jan 22 2009 vuntz@novell.com +* Fri Jan 23 2009 vuntz@novell.com - Really drop gnome-desktop-foreign-for-screen.patch, fixed upstream. -* Fri Jan 16 2009 crrodriguez@suse.de +* Sat Jan 17 2009 crrodriguez@suse.de - remove "la" files, baby step to clean up all references to libavahi-*.la * Sat Jan 10 2009 mboman@suse.de @@ -275,7 +255,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Oct 22 2008 maw@suse.de - Update to version 2.24.1: + Updated translations. -* Fri Oct 03 2008 mboman@suse.de +* Sat Oct 04 2008 mboman@suse.de - Update to version 2.24.0: + GnomeRR: don't try and set the screen size if turning off any of the CRTC's failed @@ -384,7 +364,7 @@ rm -rf $RPM_BUILD_ROOT for multilib support * Tue Apr 01 2008 vuntz@suse.de - Remove uz@cyrillic workaround (see bnc#372941) -* Thu Mar 13 2008 maw@suse.de +* Fri Mar 14 2008 maw@suse.de - Update to version 2.22.0: + Updated translations. * Tue Mar 04 2008 maw@suse.de @@ -440,7 +420,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Aug 14 2007 maw@suse.de - Rename the uz@cyrillic locale directory to uz@Cyrl to avoid unowned directories. -* Tue Aug 07 2007 maw@suse.de +* Wed Aug 08 2007 maw@suse.de - Use %%fdupes - Split off a -lang subpackage - s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun. @@ -459,7 +439,7 @@ rm -rf $RPM_BUILD_ROOT - Removed invalid desktop Category "Application" (#254654). * Fri Apr 27 2007 sbrabec@suse.cz - Do not call meinproc (#227624). -* Wed Apr 11 2007 maw@suse.de +* Thu Apr 12 2007 maw@suse.de - Update to version 2.18.1 - Minor fixes - Updated translations for both the documentation (ar and ca) @@ -482,7 +462,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Nov 15 2006 jimmyk@suse.de - Updated recently-used-apps.patch to be compatible with new recently-used format, BNC #221392. -* Thu Oct 12 2006 ro@suse.de +* Fri Oct 13 2006 ro@suse.de - added gnome-doc-utils-devel to buildreq * Mon Oct 02 2006 jhargadon@suse.de - update to version 2.16.1 @@ -563,11 +543,11 @@ rm -rf $RPM_BUILD_ROOT - Update to version 2.9.91 * Tue Feb 08 2005 sbrabec@suse.cz - Changed Categories for gnome-about (#50440). -* Sat Feb 05 2005 gekker@suse.de +* Sun Feb 06 2005 gekker@suse.de - Update to version 2.9.90.1 * Sat Jan 22 2005 gekker@suse.de - Fixing the broken build -* Thu Jan 20 2005 gekker@suse.de +* Fri Jan 21 2005 gekker@suse.de - Update to version 2.9.4 * Tue Nov 02 2004 ro@suse.de - locale rename: no -> nb