diff --git a/aisleriot-3.3.1.tar.xz b/aisleriot-3.3.1.tar.xz deleted file mode 100644 index 8b2c101..0000000 --- a/aisleriot-3.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a91dccdbe05286f80c8c6484822e7e599cc5cf11816371d38529157dfef97335 -size 4355132 diff --git a/aisleriot-3.3.2.tar.xz b/aisleriot-3.3.2.tar.xz new file mode 100644 index 0000000..ea21cb2 --- /dev/null +++ b/aisleriot-3.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00e6d1cb6baa80f1761e0ca1a29ea205605bec98ad2503e655f8b9abe1f9d11c +size 3962920 diff --git a/aisleriot.changes b/aisleriot.changes index 2521285..9faf217 100644 --- a/aisleriot.changes +++ b/aisleriot.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Feb 7 13:04:26 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.3.2: + + Misc improvements and bug fixes + + Updated translations. +- Remove xz BuildRequires now that it comes for free in the build + system. +- Drop gnome-freecell.png source file and stop manually installing + a 256x256 icon: it's done upstream now. +- Add sed hack in %prep to work around a bug in yelp-tools that + caused this tarball to not contain all help translations. + ------------------------------------------------------------------- Tue Dec 20 08:59:14 UTC 2011 - vuntz@opensuse.org diff --git a/aisleriot.spec b/aisleriot.spec index fd7fea8..c6ccdaa 100644 --- a/aisleriot.spec +++ b/aisleriot.spec @@ -1,7 +1,7 @@ # # spec file for package aisleriot # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,17 +16,15 @@ # Name: aisleriot -Version: 3.3.1 +Version: 3.3.2 Release: 0 +# FIXME drop sed hack in %%prep on update to > 3.3.2 # FIXME: the %%{_datadir}/help/$locale/ files should be found by %%find_lang Summary: Solitaire Card Games for GNOME License: GPL-3.0+ Group: Amusements/Games/Board/Card Url: http://www.gnome.org Source0: http://download.gnome.org/sources/aisleriot/3.3/%{name}-%{version}.tar.xz -# We add the 256x256 png icon for freecell from gnome-games version 2.91.3 -# tarball manually until upstream solves bgo#657280 -Source1: gnome-freecell.png BuildRequires: guile-devel BuildRequires: intltool BuildRequires: itstool @@ -34,11 +32,9 @@ BuildRequires: lsb-release # Needed to get lsb data BuildRequires: dummy-release BuildRequires: update-desktop-files -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gobject-2.0) >= 2.31.13 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(librsvg-2.0) @@ -53,6 +49,7 @@ Aisleriot is a compilation of 80 different solitaire card games. %package themes Summary: Solitaire Card Games for GNOME -- Extra Themes +Group: Amusements/Games/Board/Card Requires: %{name} = %{version} Enhances: %{name} BuildArch: noarch @@ -65,6 +62,12 @@ This package provides extra themes for Aisleriot. %lang_package %prep %setup -q +if test "%{version}" != "3.3.2"; then + echo "Sed hack should be dropped." + /bin/false +fi +sed -i "s/HELP_LINGUAS = ca de el en_GB es eu fr gl oc ru sl sr sr@latin sv zh_CN/HELP_LINGUAS = de en_GB fr/g" help/Makefile.am +sed -i "s/HELP_LINGUAS = ca de el en_GB es eu fr gl oc ru sl sr sr@latin sv zh_CN/HELP_LINGUAS = de en_GB fr/g" help/Makefile.in %build %configure \ @@ -77,11 +80,6 @@ make %{?_smp_mflags} %make_install %suse_update_desktop_file -N "FreeCell" -G "Solitaire" freecell %suse_update_desktop_file -N "AisleRiot" -G "Solitaire" sol -if [ -f %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/gnome-freecell.png ]; - then echo "Destination already exists. Perhaps fixed upstream? Please remove hack."; - /bin/false; -fi -cp %{S:1} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/ %find_lang %{name} %{?no_lang_C} %find_gconf_schemas # Localized help @@ -122,16 +120,23 @@ sort -u %{name}.help-lang.tmp | grep -v "^%%lang(C)" >> %{name}.help-lang %{_datadir}/applications/sol.desktop %{_datadir}/aisleriot/ %dir %{_libdir}/aisleriot -%{_libdir}/aisleriot/ar-cards-renderer %dir %{_libdir}/aisleriot/guile %dir %{_libdir}/aisleriot/guile/2.0 %dir %{_libdir}/aisleriot/guile/2.0/aisleriot %{_libdir}/aisleriot/guile/2.0/aisleriot/api.go %{_libdir}/aisleriot/guile/2.0/*.go +%if "%{_libdir}" != "%{_libexecdir}" +%dir %{_libexecdir}/aisleriot +%endif +%{_libexecdir}/aisleriot/ar-cards-renderer %{_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.* +# 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 +%{_libdir}/valgrind/aisleriot.supp # Exclude files that are in themes %exclude %{_datadir}/aisleriot/cards/anglo.svgz %exclude %{_datadir}/aisleriot/cards/anglo_bitmap.svgz diff --git a/gnome-freecell.png b/gnome-freecell.png deleted file mode 100644 index 2c8cd51..0000000 --- a/gnome-freecell.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd2e4c439a356f1f7458f9f74f54c49ec0c6b8a0c67cdc9e9dc0a3b82c7f146c -size 26675