From 347bb07b6b82d42b30a43449d9243fbfc5bc5a7eb4a28b835c4e70a692e1029c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 5 Jun 2018 12:17:56 +0000 Subject: [PATCH] Accepting request 614008 from home:iznogood:branches:GNOME:Factory - Drop pkgconfig(gconf-2.0) BuildRequires and gconf_schemas_prereq macro, following this: pass with-platform=gtk-only and with-gtk=3.0 to configure. No longer depend on obsolete gconf2. OBS-URL: https://build.opensuse.org/request/show/614008 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/aisleriot?expand=0&rev=101 --- aisleriot.changes | 7 +++++++ aisleriot.spec | 14 +++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/aisleriot.changes b/aisleriot.changes index 24dbcac..b3241d5 100644 --- a/aisleriot.changes +++ b/aisleriot.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 4 14:48:00 UTC 2018 - bjorn.lie@gmail.com + +- Drop pkgconfig(gconf-2.0) BuildRequires and gconf_schemas_prereq + macro, following this: pass with-platform=gtk-only and + with-gtk=3.0 to configure. No longer depend on obsolete gconf2. + ------------------------------------------------------------------- Mon Mar 12 22:16:50 UTC 2018 - dimstar@opensuse.org diff --git a/aisleriot.spec b/aisleriot.spec index 788a8ce..365fb0a 100644 --- a/aisleriot.spec +++ b/aisleriot.spec @@ -33,14 +33,12 @@ BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(gconf-2.0) >= 2.0 BuildRequires: pkgconfig(gobject-2.0) >= 2.32.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0 BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(librsvg-2.0) Requires: guile Recommends: %{name}-lang -%{gconf_schemas_prereq} %description Aisleriot is a compilation of 80 different solitaire card games. @@ -69,7 +67,10 @@ sed -i 's:DISTRO="unknown":DISTRO="opensuse":' configure --disable-schemas-install \ --disable-static \ --enable-sound \ - --with-guile=auto + --with-guile=auto \ + --with-platform=gtk-only \ + --with-gtk=3.0 \ + %{nil} make %{?_smp_mflags} %install @@ -77,13 +78,8 @@ make %{?_smp_mflags} %fdupes -s %{buildroot}%{_datadir}/help %suse_update_desktop_file -N "AisleRiot" -G "Solitaire" sol %find_lang %{name} %{?no_lang_C} -%find_gconf_schemas -%pre -f aisleriot.schemas_pre -%posttrans -f aisleriot.schemas_posttrans -%preun -f aisleriot.schemas_preun - -%files -f aisleriot.schemas_list +%files %license COPYING.GFDL %doc AUTHORS ChangeLog %if 0%{?suse_version} <= 1140