diff --git a/_service b/_service deleted file mode 100644 index c3b5274..0000000 --- a/_service +++ /dev/null @@ -1,3 +0,0 @@ - - 2.91.6gitgit://git.gnome.org/gnome-desktopgit -*.tarbz2 diff --git a/gnome-desktop-gir-no-gconf.patch b/gnome-desktop-gir-no-gconf.patch new file mode 100644 index 0000000..6714902 --- /dev/null +++ b/gnome-desktop-gir-no-gconf.patch @@ -0,0 +1,36 @@ +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 6c13d87..5a424dd 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,21 +1,42 @@ +------------------------------------------------------------------- +Fri Jan 14 15:25:14 CET 2011 - vuntz@opensuse.org + +- Remove pkgconfig(gconf-2.0) BuildRequires: it's all ported to + GSettings now. +- Add gobject-introspection-devel BuildRequires to build + introspection data. +- Add gnome-desktop-gir-no-gconf.patch to fix build of + introspection data, taken from git. +- Add back --disable-date-in-gnome-version and + --with-gnome-distributor="SUSE" to configure: gnome-version.xml + is back. +- Do not build the gnome-version subpackage if + IS_DEFAULT_GNOME_DESKTOP is 0, unless BUILD_FROM_VCS is defined. + ------------------------------------------------------------------- Wed Jan 12 10:20:36 UTC 2011 - fcrozat@novell.com + - Update to version 2.91.6: - + Prevent gnome-settings-daemon from crashing at startup -- Change from 2.91.5 : - + libgnome-desktop : - * gnome-desktop-utils has been ported to GSettings (bgo#638169) - * GnomeRRScreen, GnomeRRConfig and GnomeOutputInfo have been - turned into a GObjects (bgo#630913) API change! - * The GnomeRR api is introspectable now - * Switch thumbnailers from GConf to key files (bgo#638172) - + Translations update + + libgnome-desktop: + - Prevent gnome-settings-daemon from crashing at startup + + Misc: + - Add back gnome-version.xml. +- Changes from version 2.91.5: + + libgnome-desktop: + - gnome-desktop-utils has been ported to GSettings (bgo#638169) + - GnomeRRScreen, GnomeRRConfig and GnomeOutputInfo have been + turned into a GObjects (bgo#630913). + - The GnomeRR api is introspectable now + - Switch thumbnailers from GConf to key files (bgo#638172) + + Updated translations. - Add support for source service checkout, with %BUILD_FROM_VCS: - + Add call to ./autogen.sh (if present) - + Enforce gtk-doc html generation by passing --enable-gtk-doc to - configure. - + Add build dependencies when building from checkout + + Add call to ./autogen.sh (if present) + + Enforce gtk-doc html generation by passing --enable-gtk-doc to + configure. + + Add gnome-common, gtk-doc BuildRequires. +- Create a gnome-version subpackage to contain the xml file with + the GNOME verison. ------------------------------------------------------------------- Fri Jan 7 17:48:32 CET 2011 - vuntz@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 034c525..da8b10f 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -27,12 +27,14 @@ 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(gconf-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) @@ -43,7 +45,6 @@ BuildRequires: pkgconfig(xrandr) %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common BuildRequires: gtk-doc -BuildRequires: gobject-introspection %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,13 +52,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build This package contains the gnome-about program as well as some desktop-wide documents. +%if %IS_DEFAULT_GNOME_DESKTOP || 0%{?BUILD_FROM_VCS} %package -n gnome-version License: LGPLv2.1+ -Summary: GNOME version +Summary: GNOME version Group: System/GUI/GNOME %description -n gnome-version -This package contains information on the GNOME version installed. +This package contains information on the version of GNOME that is installed. +%endif %package -n libgnome-desktop-3-0 License: LGPLv2.1+ @@ -100,6 +103,9 @@ 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 @@ -114,8 +120,9 @@ translation-update-upstream %if 0%{?BUILD_FROM_VCS} --enable-gtk-doc \ %endif - --disable-scrollkeeper -make %{?jobs:-j%jobs} + --disable-scrollkeeper \ + --with-gnome-distributor="SUSE" \ + --disable-date-in-gnome-version %install %makeinstall @@ -134,6 +141,10 @@ make %{?jobs:-j%jobs} %find_lang gpl %{name}-3.0.lang %find_lang lgpl %{name}-3.0.lang %suse_update_desktop_file gnome-about Documentation +%else +%if ! 0%{?BUILD_FROM_VCS} +rm %{buildroot}%{_datadir}/gnome/gnome-version.xml +%endif %endif %{__rm} -vf %{buildroot}%{_libdir}/*.la %fdupes %{buildroot} @@ -150,19 +161,23 @@ rm -rf %{buildroot} %doc AUTHORS COPYING.LIB NEWS README %{_datadir}/libgnome-desktop-3.0/ %{_libdir}/libgnome-desktop-3.so.* +%{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib %files -n libgnome-desktop-3-devel %defattr (-, root, root) %{_includedir}/gnome-desktop-3.0/ %{_libdir}/libgnome-desktop-3.so %{_libdir}/pkgconfig/gnome-desktop-3.0.pc +%{_datadir}/gir-1.0/*.gir %doc %{_datadir}/gtk-doc/html/gnome-desktop3/ %files lang -f %{name}-3.0.lang +%if %IS_DEFAULT_GNOME_DESKTOP || 0%{?BUILD_FROM_VCS} %files -n gnome-version %defattr (-, root, root) %dir %{_datadir}/gnome %{_datadir}/gnome/gnome-version.xml +%endif %changelog