From 63b63d1933369942209d1f121b99ec9d10c7b2b9c58ef93da853bc77302925e4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Mar 2018 14:03:39 +0000 Subject: [PATCH] Accepting request 581423 from GNOME:Next spec-cleaner OBS-URL: https://build.opensuse.org/request/show/581423 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/aisleriot?expand=0&rev=97 --- aisleriot.changes | 5 +++++ aisleriot.spec | 20 +++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/aisleriot.changes b/aisleriot.changes index 83c8320..71aba3d 100644 --- a/aisleriot.changes +++ b/aisleriot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:22:46 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Tue Oct 31 01:44:34 UTC 2017 - luc14n0@linuxmail.org diff --git a/aisleriot.spec b/aisleriot.spec index 81ab1eb..127ce66 100644 --- a/aisleriot.spec +++ b/aisleriot.spec @@ -1,7 +1,7 @@ # # spec file for package aisleriot # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,14 +20,15 @@ Name: aisleriot Version: 3.22.4 Release: 0 Summary: Solitaire Card Games for GNOME -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Amusements/Games/Board/Card -Url: http://www.gnome.org +URL: http://www.gnome.org Source0: http://download.gnome.org/sources/aisleriot/3.22/%{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: guile-devel BuildRequires: intltool BuildRequires: lsb-release +BuildRequires: pkgconfig # Needed to get lsb data BuildRequires: update-desktop-files BuildRequires: yelp-tools @@ -39,8 +40,7 @@ BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(librsvg-2.0) Requires: guile Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gconf_schemas_prereq +%{gconf_schemas_prereq} %description Aisleriot is a compilation of 80 different solitaire card games. @@ -58,6 +58,7 @@ Aisleriot is a compilation of 80 different solitaire card games. This package provides extra themes for Aisleriot. %lang_package + %prep %setup -q @@ -79,14 +80,12 @@ make %{?_smp_mflags} %find_gconf_schemas %pre -f aisleriot.schemas_pre - %posttrans -f aisleriot.schemas_posttrans - %preun -f aisleriot.schemas_preun %files -f aisleriot.schemas_list -%defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING.GFDL COPYING.GPL3 COPYING.LGPL3 +%license COPYING.GFDL +%doc AUTHORS ChangeLog %if 0%{?suse_version} <= 1140 %doc %dir %{_datadir}/help %doc %dir %{_datadir}/help/C @@ -110,7 +109,7 @@ make %{?_smp_mflags} %{_datadir}/glib-2.0/schemas/org.gnome.Patience.WindowState.gschema.xml %{_datadir}/icons/hicolor/*/apps/gnome-aisleriot* %{_datadir}/icons/hicolor/*/apps/gnome-freecell.* -%{_mandir}/man?/sol.* +%{_mandir}/man?/sol*%{ext_man} # Kind of ugly to own the valgrind directory, but the other solutions (a dep on # valgrind, a subpackage, etc.) are not worth it %dir %{_libdir}/valgrind @@ -125,7 +124,6 @@ make %{?_smp_mflags} %exclude %{_datadir}/aisleriot/cards/ornamental.svgz %files themes -%defattr(-, root, root) %{_datadir}/aisleriot/cards/anglo.svgz %{_datadir}/aisleriot/cards/anglo_bitmap.svgz %{_datadir}/aisleriot/cards/bellot.svgz