Accepting request 136684 from GNOME:Factory

Pushing GNOME:Factory towards openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/136684
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-desktop?expand=0&rev=100

baselibs.conf

@@ -1,3 +1,3 @@
-libgnome-desktop-3-2
+libgnome-desktop-3-4
   obsoletes "gnome-desktop-<targettype> <= <version>"
   provides "gnome-desktop-<targettype> = <version>"

gnome-desktop-3.4.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7565e0a822132ea7b699cb8c64d42b57081ddefd0b5d911f4f4209be0c755952
-size 951504

gnome-desktop-3.6.0.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3a3a7229426360d48677846bf7a674b12ef89b0a353044d7cc488c438d2ee5f
+size 978080

gnome-desktop.changes

@@ -1,3 +1,123 @@
+-------------------------------------------------------------------
+Tue Sep 25 20:46:46 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.6.0.1:
+  + gnome-xkb-info: Fix introspection element-type annotations
+    (bgo#684802).
+
+-------------------------------------------------------------------
+Mon Sep 24 10:57:03 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.6.0:
+  + gnome-xkb-info: Fix a memory leak (bgo#684140)
+  + Updated translations.
+
+-------------------------------------------------------------------
+Fri Sep  7 18:08:07 UTC 2012 - vuntz@opensuse.org
+
+- Remove %IS_DEFAULT_GNOME_DESKTOP conditionals for everything
+  related to the documentation: now that they were ported to
+  yelp-tools, they can't conflict with some old GNOME 2 docs.
+- Remove libgnome-desktop-3-2 Conflicts in
+  libgnome-desktop-3_0-common: the file conflict is now gone (with
+  the port to yelp-tools), and since we never had this new package
+  in Factory, the Conflicts is useless.
+
+-------------------------------------------------------------------
+Tue Sep  4 19:12:56 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.91:
+  + gnome-xkb-info: Honor the 'show-all-sources' gsettings key
+    (bgo#682240)
+  + Make 'Mirrored Displays' string consistent with the
+    control-center (bgo#592412)
+  + Thumbnails: Determine the correct mime type when we still know
+    the filename (bgo#655406)
+  + Remove the temporary file when saving a thumbnail fails and
+    show an error when saving a thumbnail fails (bgo#681942)
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Aug 22 08:51:29 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.90:
+  + GnomeBG:
+    - Fix crash if default background not found
+    - Don't use C99 declarations
+  + Import libgsystem and use it to read thumbnails with O_NOATIME
+  + gnome-xkb-info:
+    - Parse XKB options
+    - Use glib's slice allocator for small structures
+  + Increase the size of thumbnails to 256
+  + Bugs fixed: bgo#680326, bgo#680354, bgo#681897, bgo#681929,
+    bgo#682004, bgo#682252.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Aug 15 08:08:15 UTC 2012 - dimstar@opensuse.org
+
+- Split out a libgnome-3_0-common package containing the data
+  files. Having them in the library package hinders parallel
+  installability of more than one libgnome-desktop package. This
+  package conflicts with libgnome-desktop-3-2 because of common
+  files.
+
+-------------------------------------------------------------------
+Tue Aug  7 07:36:36 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.5:
+  + Update to new GMutex API
+  + GnomeWallClock: add ignore-date property
+  + Port to new documentation infrastructure
+  + gnome-bg: load the default background if the configured one is
+    invalid
+  + Updated translations.
+- Replace gnome-doc-utils-devel BuildRequires with yelp-tools,
+  following upstreams switch to the new documentation
+  infrastructure.
+- Drop special handling for openSUSE 11.1, 11.2 and 11.3: they are
+  end of life.
+
+-------------------------------------------------------------------
+Tue Jul 17 11:36:43 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.4:
+  + Fix many documentation syntax warnings.
+  + Bugs fixed: bgo#672030, bgo#679858.
+
+-------------------------------------------------------------------
+Tue Jun 26 16:48:47 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.3:
+  + gnome-bg:
+    - Fix color conversion for solid backgrounds
+    - Force property update when doing new crossfade frame
+  + gnome-rr:
+    - Add gnome_rr_output_get_ids_from_edid()
+    - Document the default DPI setting
+    - Revert "Allow rotation if the virtual size has the correct
+      number of pixels"
+  + pnp-ids:
+    - Add test program
+    - Add loop for speed testing the ID fetching
+  + Move thumbnails into XDG_CACHE_HOME
+  + Updated translations.
+
+-------------------------------------------------------------------
+Fri Jun  8 15:16:09 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 3.5.2:
+  + Add api to parse and describe XML layouts (bgo#676583)
+  + Make monitor labels translucent and click-through (bgo#675696)
+  + Fix a crash in background slide-shows when the system clock is
+    behind (bgo#673551)
+  + Use "default" as the name for built-in laptop outputs
+    (bgo#949296)
+  + Add a gnome-rr-debug tool to help with debugging GnomeRR issues
+  + Updated translations.
+- Add libxkbfile-devel Requires in devel subpackage, as headers
+  from there are used.
+
 -------------------------------------------------------------------
 Mon May 14 14:45:36 UTC 2012 - vuntz@opensuse.org
 

gnome-desktop.spec

@@ -19,26 +19,28 @@
 %define IS_DEFAULT_GNOME_DESKTOP 1
 
 Name:           gnome-desktop
-Version:        3.4.2
+Version:        3.6.0.1
 Release:        0
 Summary:        The GNOME Desktop API Library
 License:        LGPL-2.1+
 Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/gnome-desktop/3.4/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-desktop/3.6/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 BuildRequires:  fdupes
-BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
+BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
-BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.33.3
-BuildRequires:  pkgconfig(gsettings-desktop-schemas)
+BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.5.91
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.3.6
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xext) >= 1.1
-BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xkbfile)
+BuildRequires:  pkgconfig(xkeyboard-config)
+BuildRequires:  pkgconfig(xrandr) >= 1.3
 %if 0%{?BUILD_FROM_VCS}
 BuildRequires:  gnome-common
 BuildRequires:  gtk-doc
@@ -61,17 +63,30 @@ Obsoletes:      gnome-about < %{version}
 This package contains information on the version of GNOME that is installed.
 %endif
 
-%package -n libgnome-desktop-3-2
+%package -n libgnome-desktop-3_0-common
+Summary:        The GNOME Desktop API Library -- Common data files
+Group:          System/Libraries
+
+%description -n libgnome-desktop-3_0-common
+The libgnome-desktop library provides API shared by several applications
+on the desktop, but that cannot live in the platform for various
+reasons.
+
+This package contains data files used by libgnome-dekstop.
+
+%package -n libgnome-desktop-3-4
 Summary:        The GNOME Desktop API Library
 Group:          System/GUI/GNOME
 Requires:       gsettings-desktop-schemas
+# Data files for libgnome-desktop, split in an own package for SLPP compliancy
+Requires:       libgnome-desktop-3_0-common >= %{version}
 Recommends:     %{name}-lang
 Provides:       %{name} = %{version}
 %if %IS_DEFAULT_GNOME_DESKTOP
 Obsoletes:      %{name} < %{version}
 %endif
 
-%description -n libgnome-desktop-3-2
+%description -n libgnome-desktop-3-4
 The libgnome-desktop library provides API shared by several applications
 on the desktop, but that cannot live in the platform for various
 reasons.
@@ -91,8 +106,10 @@ libgnome-desktop.
 %package -n libgnome-desktop-3-devel
 Summary:        The GNOME Desktop API Library -- Development Files
 Group:          Development/Libraries/GNOME
-Requires:       libgnome-desktop-3-2 = %{version}
+Requires:       libgnome-desktop-3-4 = %{version}
 Requires:       typelib-1_0-GnomeDesktop-3_0 = %{version}
+# Needed as /usr/include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h includes X11/extensions/XKBrules.h
+Requires:       libxkbfile-devel
 %if %IS_DEFAULT_GNOME_DESKTOP
 Provides:       %{name}-devel = %{version}
 Obsoletes:      %{name}-devel < %{version}
@@ -117,9 +134,6 @@ translation-update-upstream
 %build
 %configure --with-pic\
 	--disable-static\
-%if ! %IS_DEFAULT_GNOME_DESKTOP
-        --disable-desktop-docs \
-%endif
 %if 0%{?BUILD_FROM_VCS}
         --enable-gtk-doc \
 %endif
@@ -130,51 +144,36 @@ make %{?_smp_mflags} V=1
 
 %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
-%if 0%{?suse_version} <= 1130
-%{__rm} %{buildroot}%{_datadir}/locale/kg/LC_MESSAGES/*
-%endif
 %find_lang %{name}-3.0 %{?no_lang_C}
-%if %IS_DEFAULT_GNOME_DESKTOP
 %find_lang fdl %{?no_lang_C} %{name}-3.0.lang
 %find_lang gpl %{?no_lang_C} %{name}-3.0.lang
 %find_lang lgpl %{?no_lang_C} %{name}-3.0.lang
-%else
+%if ! (%IS_DEFAULT_GNOME_DESKTOP || 0%{?BUILD_FROM_VCS})
-%if ! 0%{?BUILD_FROM_VCS}
 rm %{buildroot}%{_datadir}/gnome/gnome-version.xml
 %endif
-%endif
 %{__rm} -vf %{buildroot}%{_libdir}/*.la
 %fdupes %{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
-%post -n libgnome-desktop-3-2 -p /sbin/ldconfig
+%post -n libgnome-desktop-3-4 -p /sbin/ldconfig
 
-%postun -n libgnome-desktop-3-2 -p /sbin/ldconfig
+%postun -n libgnome-desktop-3-4 -p /sbin/ldconfig
 
-%files -n libgnome-desktop-3-2
+%files -n libgnome-desktop-3-4
 %defattr(-, root, root)
 %doc AUTHORS COPYING.LIB NEWS README
-%if %IS_DEFAULT_GNOME_DESKTOP
-# We don't have a better location for the license help files
-%dir %{_datadir}/gnome/
-%dir %{_datadir}/gnome/help/
-%dir %{_datadir}/gnome/help/*/
-%doc %{_datadir}/gnome/help/*/C/
-%dir %{_datadir}/omf/
-%dir %{_datadir}/omf/*/
-%doc %{_datadir}/omf/*/*-C.omf
-%endif
-%{_datadir}/libgnome-desktop-3.0/
 %{_libdir}/libgnome-desktop-3.so.*
 
+%files -n libgnome-desktop-3_0-common
+%defattr(-,root,root)
+%doc %{_datadir}/help/C/fdl/
+%doc %{_datadir}/help/C/gpl/
+%doc %{_datadir}/help/C/lgpl/
+%{_datadir}/libgnome-desktop-3.0/
+%{_libexecdir}/gnome-rr-debug
+
 %files -n typelib-1_0-GnomeDesktop-3_0
 %defattr(-,root,root)
 %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib