From e47578442844a02f099c6282639cf943cfa060fba21f051b2a64a7f97a2e8a2c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 14 Jan 2011 15:12:33 +0000 Subject: [PATCH 1/5] Accepting request 58239 from home:fcrozat:gnome3 thanks OBS-URL: https://build.opensuse.org/request/show/58239 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=97 --- _service | 3 +++ gnome-desktop-2.91.4.tar.bz2 | 3 --- gnome-desktop-2.91.6.tar.bz2 | 3 +++ gnome-desktop.changes | 19 +++++++++++++++++++ gnome-desktop.spec | 31 ++++++++++++++++++++++++++++--- 5 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 _service delete mode 100644 gnome-desktop-2.91.4.tar.bz2 create mode 100644 gnome-desktop-2.91.6.tar.bz2 diff --git a/_service b/_service new file mode 100644 index 0000000..c3b5274 --- /dev/null +++ b/_service @@ -0,0 +1,3 @@ + + 2.91.6gitgit://git.gnome.org/gnome-desktopgit +*.tarbz2 diff --git a/gnome-desktop-2.91.4.tar.bz2 b/gnome-desktop-2.91.4.tar.bz2 deleted file mode 100644 index 4124d99..0000000 --- a/gnome-desktop-2.91.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3742e2f5ff79188a656d9908ea0e4a0f583fa8f1fc159a2e04a8b9cf4c9445a -size 1226137 diff --git a/gnome-desktop-2.91.6.tar.bz2 b/gnome-desktop-2.91.6.tar.bz2 new file mode 100644 index 0000000..9df7015 --- /dev/null +++ b/gnome-desktop-2.91.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32d7dd48bac932ac1d1c9b2b34b996e6d6939800badffad4766d74c67c9e4311 +size 1187401 diff --git a/gnome-desktop.changes b/gnome-desktop.changes index fc7b9cf..6c13d87 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +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 +- 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 + ------------------------------------------------------------------- Fri Jan 7 17:48:32 CET 2011 - vuntz@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 6b8776e..825c6e0 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -1,7 +1,7 @@ # -# spec file for package gnome-desktop (Version 2.91.4) +# spec file for package gnome-desktop (Version 2.91.6) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define IS_DEFAULT_GNOME_DESKTOP 0 Name: gnome-desktop -Version: 2.91.4 +Version: 2.91.6 Release: 1 License: LGPLv2.1+ Summary: The GNOME Desktop API Library @@ -40,12 +40,25 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xrandr) +%if 0%{?BUILD_FROM_VCS} +BuildRequires: gnome-common +BuildRequires: gtk-doc +BuildRequires: gobject-introspection +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains the gnome-about program as well as some desktop-wide documents. +%package -n gnome-version +License: LGPLv2.1+ +Summary: GNOME version +Group: System/GUI/GNOME + +%description -n gnome-version +This package contains information on the GNOME version installed. + %package -n libgnome-desktop-3-0 License: LGPLv2.1+ Summary: The GNOME Desktop API Library @@ -88,11 +101,18 @@ gtk-doc. %setup -q translation-update-upstream +%if 0%{?BUILD_FROM_VCS} +[ -x ./autogen.sh] && NOCONFIGURE=1 ./autogen.sh +%endif + %build %configure --with-pic\ --disable-static\ %if ! %IS_DEFAULT_GNOME_DESKTOP --disable-desktop-docs \ +%endif +%if 0%{?BUILD_FROM_VCS} + --enable-gtk-doc \ %endif --disable-scrollkeeper make %{?jobs:-j%jobs} @@ -140,4 +160,9 @@ rm -rf %{buildroot} %files lang -f %{name}-3.0.lang +%files -n gnome-version +%defattr (-, root, root) +%dir %{_datadir}/gnome +%{_datadir}/gnome/gnome-version.xml + %changelog From 2d1a91d4e3ac8f0ec890bb1ae157fa625b778438bfb754fdb6e034b2fb47eaf2 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 14 Jan 2011 16:18:09 +0000 Subject: [PATCH 2/5] unbreak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=99 --- gnome-desktop.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 825c6e0..034c525 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-desktop (Version 2.91.6) # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From f9911c669a109e012d7ba856f60575879d9c0d5a75ade16e91c858ac00bbea3f Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Fri, 14 Jan 2011 16:18:54 +0000 Subject: [PATCH 3/5] generated via source service OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=100 --- ...gnome-desktop-2.91.6git.1295018536.tar.bz2 | 3 + _service:set_version:gnome-desktop.spec | 168 ++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 _service:recompress:tar_scm:gnome-desktop-2.91.6git.1295018536.tar.bz2 create mode 100644 _service:set_version:gnome-desktop.spec diff --git a/_service:recompress:tar_scm:gnome-desktop-2.91.6git.1295018536.tar.bz2 b/_service:recompress:tar_scm:gnome-desktop-2.91.6git.1295018536.tar.bz2 new file mode 100644 index 0000000..02bd044 --- /dev/null +++ b/_service:recompress:tar_scm:gnome-desktop-2.91.6git.1295018536.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d623640b7adc67605ccbbbbb4f2f48bc530349f3d5b757f5ed6347819ba647ef +size 19603556 diff --git a/_service:set_version:gnome-desktop.spec b/_service:set_version:gnome-desktop.spec new file mode 100644 index 0000000..f381dd6 --- /dev/null +++ b/_service:set_version:gnome-desktop.spec @@ -0,0 +1,168 @@ +# +# spec file for package gnome-desktop (Version 2.91.6) +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define IS_DEFAULT_GNOME_DESKTOP 0 + +Name: gnome-desktop +Version: 2.91.6git.1295018536 +Release: 0 +License: LGPLv2.1+ +Summary: The GNOME Desktop API Library +Url: http://www.gnome.org +Group: System/GUI/GNOME +Source: %{name}-%{version}.tar.bz2 +Source99: baselibs.conf +BuildRequires: fdupes +BuildRequires: gnome-doc-utils-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) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libstartup-notification-1.0) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xrandr) +%if 0%{?BUILD_FROM_VCS} +BuildRequires: gnome-common +BuildRequires: gtk-doc +BuildRequires: gobject-introspection +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +This package contains the gnome-about program as well as some +desktop-wide documents. + +%package -n gnome-version +License: LGPLv2.1+ +Summary: GNOME version +Group: System/GUI/GNOME + +%description -n gnome-version +This package contains information on the GNOME version installed. + +%package -n libgnome-desktop-3-0 +License: LGPLv2.1+ +Summary: The GNOME Desktop API Library +Group: System/GUI/GNOME +Requires: gsettings-desktop-schemas +Recommends: %{name}-lang +Provides: %{name} = %{version} +%if %IS_DEFAULT_GNOME_DESKTOP +Obsoletes: %{name} < %{version} +%endif + +%description -n libgnome-desktop-3-0 +The libgnome-desktop library provides API shared by several applications +on the desktop, but that cannot live in the platform for various +reasons. There is no API or ABI guarantee, although we are doing our +best to provide stability. Documentation for the API is available with +gtk-doc. + +%package -n libgnome-desktop-3-devel +License: LGPLv2.1+ +Summary: The GNOME Desktop API Library -- Development Files +Group: Development/Libraries/GNOME +Requires: libgnome-desktop-3-0 = %{version} +%if %IS_DEFAULT_GNOME_DESKTOP +Provides: %{name}-devel = %{version} +Obsoletes: %{name}-devel < %{version} +Provides: %{name}-doc = %{version} +Obsoletes: %{name}-doc < %{version} +%endif + +%description -n libgnome-desktop-3-devel +The libgnome-desktop library provides API shared by several applications +on the desktop, but that cannot live in the platform for various +reasons. There is no API or ABI guarantee, although we are doing our +best to provide stability. Documentation for the API is available with +gtk-doc. + +%lang_package +%prep +%setup -q +translation-update-upstream + +%if 0%{?BUILD_FROM_VCS} +[ -x ./autogen.sh] && NOCONFIGURE=1 ./autogen.sh +%endif + +%build +%configure --with-pic\ + --disable-static\ +%if ! %IS_DEFAULT_GNOME_DESKTOP + --disable-desktop-docs \ +%endif +%if 0%{?BUILD_FROM_VCS} + --enable-gtk-doc \ +%endif + --disable-scrollkeeper +make %{?jobs:-j%jobs} + +%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 +%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 +%endif +%{__rm} -vf %{buildroot}%{_libdir}/*.la +%fdupes %{buildroot} + +%clean +rm -rf %{buildroot} + +%post -n libgnome-desktop-3-0 -p /sbin/ldconfig + +%postun -n libgnome-desktop-3-0 -p /sbin/ldconfig + +%files -n libgnome-desktop-3-0 +%defattr(-, root, root) +%doc AUTHORS COPYING.LIB NEWS README +%{_datadir}/libgnome-desktop-3.0/ +%{_libdir}/libgnome-desktop-3.so.* + +%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 +%doc %{_datadir}/gtk-doc/html/gnome-desktop3/ + +%files lang -f %{name}-3.0.lang + +%files -n gnome-version +%defattr (-, root, root) +%dir %{_datadir}/gnome +%{_datadir}/gnome/gnome-version.xml + +%changelog From 09b7c556776a10e1ed301a18067133b43194dbfa63eae7f985dc28dbd209f9fb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 16 Jan 2011 15:44:53 +0000 Subject: [PATCH 4/5] Accepting request 58272 from home:vuntz:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/58272 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=101 --- _service | 3 -- gnome-desktop-gir-no-gconf.patch | 36 ++++++++++++++++++++++++ gnome-desktop.changes | 47 +++++++++++++++++++++++--------- gnome-desktop.spec | 27 ++++++++++++++---- 4 files changed, 91 insertions(+), 22 deletions(-) delete mode 100644 _service create mode 100644 gnome-desktop-gir-no-gconf.patch 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 From cb8893f215f7e4fa25125b3f41d83babb7411379054f1d65df308889a8c80043 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 17 Jan 2011 09:16:06 +0000 Subject: [PATCH 5/5] unbreak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=102 --- ...gnome-desktop-2.91.6git.1295018536.tar.bz2 | 3 - _service:set_version:gnome-desktop.spec | 168 ------------------ gnome-desktop.changes | 2 +- 3 files changed, 1 insertion(+), 172 deletions(-) delete mode 100644 _service:recompress:tar_scm:gnome-desktop-2.91.6git.1295018536.tar.bz2 delete mode 100644 _service:set_version:gnome-desktop.spec diff --git a/_service:recompress:tar_scm:gnome-desktop-2.91.6git.1295018536.tar.bz2 b/_service:recompress:tar_scm:gnome-desktop-2.91.6git.1295018536.tar.bz2 deleted file mode 100644 index 02bd044..0000000 --- a/_service:recompress:tar_scm:gnome-desktop-2.91.6git.1295018536.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d623640b7adc67605ccbbbbb4f2f48bc530349f3d5b757f5ed6347819ba647ef -size 19603556 diff --git a/_service:set_version:gnome-desktop.spec b/_service:set_version:gnome-desktop.spec deleted file mode 100644 index f381dd6..0000000 --- a/_service:set_version:gnome-desktop.spec +++ /dev/null @@ -1,168 +0,0 @@ -# -# spec file for package gnome-desktop (Version 2.91.6) -# -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -%define IS_DEFAULT_GNOME_DESKTOP 0 - -Name: gnome-desktop -Version: 2.91.6git.1295018536 -Release: 0 -License: LGPLv2.1+ -Summary: The GNOME Desktop API Library -Url: http://www.gnome.org -Group: System/GUI/GNOME -Source: %{name}-%{version}.tar.bz2 -Source99: baselibs.conf -BuildRequires: fdupes -BuildRequires: gnome-doc-utils-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) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libstartup-notification-1.0) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xrandr) -%if 0%{?BUILD_FROM_VCS} -BuildRequires: gnome-common -BuildRequires: gtk-doc -BuildRequires: gobject-introspection -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -This package contains the gnome-about program as well as some -desktop-wide documents. - -%package -n gnome-version -License: LGPLv2.1+ -Summary: GNOME version -Group: System/GUI/GNOME - -%description -n gnome-version -This package contains information on the GNOME version installed. - -%package -n libgnome-desktop-3-0 -License: LGPLv2.1+ -Summary: The GNOME Desktop API Library -Group: System/GUI/GNOME -Requires: gsettings-desktop-schemas -Recommends: %{name}-lang -Provides: %{name} = %{version} -%if %IS_DEFAULT_GNOME_DESKTOP -Obsoletes: %{name} < %{version} -%endif - -%description -n libgnome-desktop-3-0 -The libgnome-desktop library provides API shared by several applications -on the desktop, but that cannot live in the platform for various -reasons. There is no API or ABI guarantee, although we are doing our -best to provide stability. Documentation for the API is available with -gtk-doc. - -%package -n libgnome-desktop-3-devel -License: LGPLv2.1+ -Summary: The GNOME Desktop API Library -- Development Files -Group: Development/Libraries/GNOME -Requires: libgnome-desktop-3-0 = %{version} -%if %IS_DEFAULT_GNOME_DESKTOP -Provides: %{name}-devel = %{version} -Obsoletes: %{name}-devel < %{version} -Provides: %{name}-doc = %{version} -Obsoletes: %{name}-doc < %{version} -%endif - -%description -n libgnome-desktop-3-devel -The libgnome-desktop library provides API shared by several applications -on the desktop, but that cannot live in the platform for various -reasons. There is no API or ABI guarantee, although we are doing our -best to provide stability. Documentation for the API is available with -gtk-doc. - -%lang_package -%prep -%setup -q -translation-update-upstream - -%if 0%{?BUILD_FROM_VCS} -[ -x ./autogen.sh] && NOCONFIGURE=1 ./autogen.sh -%endif - -%build -%configure --with-pic\ - --disable-static\ -%if ! %IS_DEFAULT_GNOME_DESKTOP - --disable-desktop-docs \ -%endif -%if 0%{?BUILD_FROM_VCS} - --enable-gtk-doc \ -%endif - --disable-scrollkeeper -make %{?jobs:-j%jobs} - -%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 -%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 -%endif -%{__rm} -vf %{buildroot}%{_libdir}/*.la -%fdupes %{buildroot} - -%clean -rm -rf %{buildroot} - -%post -n libgnome-desktop-3-0 -p /sbin/ldconfig - -%postun -n libgnome-desktop-3-0 -p /sbin/ldconfig - -%files -n libgnome-desktop-3-0 -%defattr(-, root, root) -%doc AUTHORS COPYING.LIB NEWS README -%{_datadir}/libgnome-desktop-3.0/ -%{_libdir}/libgnome-desktop-3.so.* - -%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 -%doc %{_datadir}/gtk-doc/html/gnome-desktop3/ - -%files lang -f %{name}-3.0.lang - -%files -n gnome-version -%defattr (-, root, root) -%dir %{_datadir}/gnome -%{_datadir}/gnome/gnome-version.xml - -%changelog diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 5a424dd..d9956d7 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -6,7 +6,7 @@ Fri Jan 14 15:25:14 CET 2011 - vuntz@opensuse.org - 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. + introspection data. Taken from git. - Add back --disable-date-in-gnome-version and --with-gnome-distributor="SUSE" to configure: gnome-version.xml is back.