From 43e92d27f48d4adf540aca873e1956fb13123bf36d8be5d7212b9333a22b37f1 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 13 Feb 2011 20:41:45 +0000 Subject: [PATCH] Accepting request 60714 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/60714 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=104 --- gnome-desktop-2.91.6.1.tar.bz2 | 3 +++ gnome-desktop-2.91.6.tar.bz2 | 3 --- gnome-desktop-gir-no-gconf.patch | 36 -------------------------------- gnome-desktop.changes | 14 +++++++++++++ gnome-desktop.spec | 27 +++++++++++++----------- 5 files changed, 32 insertions(+), 51 deletions(-) create mode 100644 gnome-desktop-2.91.6.1.tar.bz2 delete mode 100644 gnome-desktop-2.91.6.tar.bz2 delete mode 100644 gnome-desktop-gir-no-gconf.patch diff --git a/gnome-desktop-2.91.6.1.tar.bz2 b/gnome-desktop-2.91.6.1.tar.bz2 new file mode 100644 index 0000000..2a2d40b --- /dev/null +++ b/gnome-desktop-2.91.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f96b112b3592bcafa99b3948305007991f086277a438cd6f6e82ffd299221447 +size 1243106 diff --git a/gnome-desktop-2.91.6.tar.bz2 b/gnome-desktop-2.91.6.tar.bz2 deleted file mode 100644 index 9df7015..0000000 --- a/gnome-desktop-2.91.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32d7dd48bac932ac1d1c9b2b34b996e6d6939800badffad4766d74c67c9e4311 -size 1187401 diff --git a/gnome-desktop-gir-no-gconf.patch b/gnome-desktop-gir-no-gconf.patch deleted file mode 100644 index 6714902..0000000 --- a/gnome-desktop-gir-no-gconf.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit a2c837a301a0a0a6d1b94b329af16359c2c701e6 -Author: Vincent Untz -Date: Fri Jan 14 16:22:16 2011 +0100 - - build: Do not pretend we need gconf for introspection - -Index: gnome-desktop-2.91.6/libgnome-desktop/Makefile.am -=================================================================== ---- gnome-desktop-2.91.6.orig/libgnome-desktop/Makefile.am -+++ gnome-desktop-2.91.6/libgnome-desktop/Makefile.am -@@ -73,8 +73,8 @@ INTROSPECTION_COMPILER_ARGS = --included - if HAVE_INTROSPECTION - - GnomeDesktop-3.0.gir: libgnome-desktop-3.la --GnomeDesktop_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 GConf-2.0 --GnomeDesktop_3_0_gir_PACKAGES = gdk-pixbuf-2.0 glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 gconf-2.0 gsettings-desktop-schemas -+GnomeDesktop_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 -+GnomeDesktop_3_0_gir_PACKAGES = gdk-pixbuf-2.0 glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 gsettings-desktop-schemas - GnomeDesktop_3_0_gir_CFLAGS = -DGNOME_DESKTOP_USE_UNSTABLE_API -I$(top_srcdir) - GnomeDesktop_3_0_gir_LIBS = libgnome-desktop-3.la - GnomeDesktop_3_0_gir_FILES = $(introspection_sources) $(libgnome_desktop_HEADERS) -Index: gnome-desktop-2.91.6/libgnome-desktop/Makefile.in -=================================================================== ---- gnome-desktop-2.91.6.orig/libgnome-desktop/Makefile.in -+++ gnome-desktop-2.91.6/libgnome-desktop/Makefile.in -@@ -382,8 +382,8 @@ pnpdata_DATA_dist = pnp.ids - INTROSPECTION_GIRS = $(am__append_1) - INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all - INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --@HAVE_INTROSPECTION_TRUE@GnomeDesktop_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 GConf-2.0 --@HAVE_INTROSPECTION_TRUE@GnomeDesktop_3_0_gir_PACKAGES = gdk-pixbuf-2.0 glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 gconf-2.0 gsettings-desktop-schemas -+@HAVE_INTROSPECTION_TRUE@GnomeDesktop_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 -+@HAVE_INTROSPECTION_TRUE@GnomeDesktop_3_0_gir_PACKAGES = gdk-pixbuf-2.0 glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 gsettings-desktop-schemas - @HAVE_INTROSPECTION_TRUE@GnomeDesktop_3_0_gir_CFLAGS = -DGNOME_DESKTOP_USE_UNSTABLE_API -I$(top_srcdir) - @HAVE_INTROSPECTION_TRUE@GnomeDesktop_3_0_gir_LIBS = libgnome-desktop-3.la - @HAVE_INTROSPECTION_TRUE@GnomeDesktop_3_0_gir_FILES = $(introspection_sources) $(libgnome_desktop_HEADERS) diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 5c1daab..c71f727 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Feb 13 21:08:35 CET 2011 - vuntz@opensuse.org + +- Update to version 2.91.6.1: + + Do not require gconf to build introspection data. + + Updated translations. +- Drop gnome-desktop-gir-no-gconf.patch: fixed upstream. +- Remove unneeded update-desktop-files BuildRequires as there are + no desktop files anymore. +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. +- Change Requires of lang subpackage to Recommends, since the + english documentation is not there anymore. + ------------------------------------------------------------------- Fri Jan 14 15:25:14 CET 2011 - vuntz@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 3786c1d..0ed5b91 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -19,7 +19,7 @@ %define IS_DEFAULT_GNOME_DESKTOP 0 Name: gnome-desktop -Version: 2.91.6 +Version: 2.91.6.1 Release: 1 License: LGPLv2.1+ Summary: The GNOME Desktop API Library @@ -27,14 +27,11 @@ Url: http://www.gnome.org Group: System/GUI/GNOME Source: %{name}-%{version}.tar.bz2 Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gnome-desktop-gir-no-gconf.patch vuntz@opensuse.org -- Fix build of introspection, taken from git. -Patch0: gnome-desktop-gir-no-gconf.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: translation-update-upstream -BuildRequires: update-desktop-files BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) @@ -104,9 +101,6 @@ gtk-doc. %prep %setup -q translation-update-upstream -%if !0%{?BUILD_FROM_VCS} -%patch0 -p1 -%endif %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh] && NOCONFIGURE=1 ./autogen.sh @@ -136,12 +130,11 @@ translation-update-upstream %if 0%{?suse_version} <= 1130 %{__rm} %{buildroot}%{_datadir}/locale/kg/LC_MESSAGES/* %endif -%find_lang %{name}-3.0 +%find_lang %{name}-3.0 %{?no_lang_C} %if %IS_DEFAULT_GNOME_DESKTOP -%find_lang fdl %{name}-3.0.lang -%find_lang gpl %{name}-3.0.lang -%find_lang lgpl %{name}-3.0.lang -%suse_update_desktop_file gnome-about Documentation +%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} rm %{buildroot}%{_datadir}/gnome/gnome-version.xml @@ -160,6 +153,16 @@ rm -rf %{buildroot} %files -n libgnome-desktop-3-0 %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.* %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib