diff --git a/gnome-desktop.changes b/gnome-desktop.changes index b2d6de6..fc7147c 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 @@ -6,8 +17,8 @@ Tue Sep 4 19:12:56 UTC 2012 - dimstar@opensuse.org (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) + + 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. @@ -16,10 +27,10 @@ Tue Sep 4 19:12:56 UTC 2012 - dimstar@opensuse.org 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 + + 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 @@ -33,7 +44,9 @@ 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. + 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 @@ -45,8 +58,8 @@ Tue Aug 7 07:36:36 UTC 2012 - dimstar@opensuse.org + 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 +- 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. @@ -64,7 +77,7 @@ 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 + - Force property update when doing new crossfade frame + gnome-rr: - Add gnome_rr_output_get_ids_from_edid() - Document the default DPI setting @@ -88,14 +101,14 @@ Fri Jun 8 15:16:09 UTC 2012 - dimstar@opensuse.org (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 - 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 737dac5..f3bd213 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -30,10 +30,8 @@ Source99: baselibs.conf BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: intltool -BuildRequires: itstool -# Needed for xmllint -BuildRequires: libxml2 BuildRequires: translation-update-upstream +BuildRequires: yelp-tools BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.33.3 BuildRequires: pkgconfig(gsettings-desktop-schemas) @@ -68,8 +66,6 @@ This package contains information on the version of GNOME that is installed. %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 @@ -138,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 @@ -152,15 +145,12 @@ make %{?_smp_mflags} V=1 %install %makeinstall %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 ! 0%{?BUILD_FROM_VCS} +%if ! (%IS_DEFAULT_GNOME_DESKTOP || 0%{?BUILD_FROM_VCS}) rm %{buildroot}%{_datadir}/gnome/gnome-version.xml %endif -%endif %{__rm} -vf %{buildroot}%{_libdir}/*.la %fdupes %{buildroot} @@ -178,17 +168,11 @@ rm -rf %{buildroot} %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 -%if %IS_DEFAULT_GNOME_DESKTOP -# We don't have a better location for the license help files -%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 %files -n typelib-1_0-GnomeDesktop-3_0 %defattr(-,root,root)