From 9e074cfb515d77763b31f4b1df5b5787dd341248186be936ce0c2d7492450d73 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Sep 2012 18:06:33 +0000 Subject: [PATCH] Accepting request 132694 from GNOME:Next Starting to push GNOME:Next... OBS-URL: https://build.opensuse.org/request/show/132694 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=149 --- baselibs.conf | 2 +- gnome-desktop-3.4.2.tar.xz | 3 -- gnome-desktop-3.5.91.tar.xz | 3 ++ gnome-desktop.changes | 93 +++++++++++++++++++++++++++++++++++++ gnome-desktop.spec | 71 +++++++++++++++++----------- 5 files changed, 140 insertions(+), 32 deletions(-) delete mode 100644 gnome-desktop-3.4.2.tar.xz create mode 100644 gnome-desktop-3.5.91.tar.xz diff --git a/baselibs.conf b/baselibs.conf index 220f302..4bcc7f1 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libgnome-desktop-3-2 +libgnome-desktop-3-4 obsoletes "gnome-desktop- <= " provides "gnome-desktop- = " diff --git a/gnome-desktop-3.4.2.tar.xz b/gnome-desktop-3.4.2.tar.xz deleted file mode 100644 index 15643f8..0000000 --- a/gnome-desktop-3.4.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7565e0a822132ea7b699cb8c64d42b57081ddefd0b5d911f4f4209be0c755952 -size 951504 diff --git a/gnome-desktop-3.5.91.tar.xz b/gnome-desktop-3.5.91.tar.xz new file mode 100644 index 0000000..b6ad9b8 --- /dev/null +++ b/gnome-desktop-3.5.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68b85b31e137af27edc0f9a0b56c9113f4df61d0172716c97b3e96ad12a2112a +size 948840 diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 4ac795a..b2d6de6 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,8 +1,101 @@ +------------------------------------------------------------------- +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) + + 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: + + Fix crash if default background not found + + gnome-bg: Don't use C99 declarations + + Pull in libgsystem, use it to read thumbnails with O_NOATIME + + Fix up submodule setup + + 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. + +------------------------------------------------------------------- +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 itstool and + libxml, 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. + ------------------------------------------------------------------- Mon May 14 14:45:36 UTC 2012 - vuntz@opensuse.org - Update to version 3.4.2: + GnomeBG: Fix crash when system clock is behind start date +- Add libxkbfile-devel Requires in -devel, as headers from there + are #include'd. ------------------------------------------------------------------- Tue Apr 17 05:50:03 UTC 2012 - vuntz@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 5c1723a..737dac5 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -19,25 +19,29 @@ %define IS_DEFAULT_GNOME_DESKTOP 1 Name: gnome-desktop -Version: 3.4.2 +Version: 3.5.91 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.5/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: fdupes -BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel BuildRequires: intltool +BuildRequires: itstool +# Needed for xmllint +BuildRequires: libxml2 BuildRequires: translation-update-upstream 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(gtk+-3.0) >= 3.3.6 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xkbfile) +BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: pkgconfig(xrandr) %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common @@ -61,17 +65,32 @@ 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 +# libgnome-desktop-3-2 did package the data files in the lib packag +Conflicts: libgnome-desktop-3-2 <= 3.4.2 + +%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 +110,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} @@ -130,15 +151,6 @@ 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 @@ -155,25 +167,28 @@ rm %{buildroot}%{_datadir}/gnome/gnome-version.xml %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 +%{_libdir}/libgnome-desktop-3.so.* + +%files -n libgnome-desktop-3_0-common +%defattr(-,root,root) +%{_datadir}/libgnome-desktop-3.0/ +%{_libexecdir}/gnome-rr-debug %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 +%dir %{_datadir}/help/C/fdl +%{_datadir}/help/C/fdl/index.docbook +%dir %{_datadir}/help/C/gpl +%{_datadir}/help/C/gpl/index.docbook +%dir %{_datadir}/help/C/lgpl +%{_datadir}/help/C/lgpl/index.docbook %endif -%{_datadir}/libgnome-desktop-3.0/ -%{_libdir}/libgnome-desktop-3.so.* %files -n typelib-1_0-GnomeDesktop-3_0 %defattr(-,root,root)