From 326ac3298092e425a709e2ec5ce91ed6c78d6c78406d8cb408e8b2743b6c9fb5 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 22 Sep 2011 12:03:29 +0000 Subject: [PATCH] Accepting request 84447 from home:vuntz:branches:GNOME:Factory Update to 3.1.92 OBS-URL: https://build.opensuse.org/request/show/84447 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/aisleriot?expand=0&rev=11 --- aisleriot-3.1.1.tar.bz2 | 3 --- aisleriot-3.1.92.tar.bz2 | 3 +++ aisleriot-theme-install.patch | 13 ------------ aisleriot.changes | 21 ++++++++++++++++++++ aisleriot.spec | 37 +++++++++++++++++++---------------- 5 files changed, 44 insertions(+), 33 deletions(-) delete mode 100644 aisleriot-3.1.1.tar.bz2 create mode 100644 aisleriot-3.1.92.tar.bz2 delete mode 100644 aisleriot-theme-install.patch diff --git a/aisleriot-3.1.1.tar.bz2 b/aisleriot-3.1.1.tar.bz2 deleted file mode 100644 index 6e70051..0000000 --- a/aisleriot-3.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61a93c95f1ea470b64ba10e65edb966c03d7afebff82e5a5f5c6e15cbcce096f -size 5484674 diff --git a/aisleriot-3.1.92.tar.bz2 b/aisleriot-3.1.92.tar.bz2 new file mode 100644 index 0000000..14336bf --- /dev/null +++ b/aisleriot-3.1.92.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c46b22aba51b9c120734baf6a268da1ef476026e7338ee7b2332332fd98ffc5 +size 5425912 diff --git a/aisleriot-theme-install.patch b/aisleriot-theme-install.patch deleted file mode 100644 index 9330c5a..0000000 --- a/aisleriot-theme-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: aisleriot-3.1.0/data/theme-install.ini -=================================================================== ---- aisleriot-3.1.0.orig/data/theme-install.ini -+++ aisleriot-3.1.0/data/theme-install.ini -@@ -37,7 +37,7 @@ ThemesKDE=kdegames-minimal; - ThemesPySol=PySolFC-cardsets; - - [SUSE LINUX] --ThemesSVG=gnome-games-extra-data; -+ThemesSVG=aisleriot-themes; - ThemesKDE=kdegames4-carddecks-default;kdegames4-carddecks-other; - ThemesPySol=pysol-cardsets; - diff --git a/aisleriot.changes b/aisleriot.changes index 0637a72..2195400 100644 --- a/aisleriot.changes +++ b/aisleriot.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Sep 21 17:38:02 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.1.92: + + Distribute a copy of the LGPL + + Update card theme install info for opensuse and ubuntu + (bgo#648601) + + Update card theme install info for ubuntu (bgo#648601) + + Fix the build with the 'file' help method (bgo#656967) + + Build ghelp with yelp-tools instead of gnome-doc-utils + (bgo#657683) + + Fix game restart (bgo#657735) + + Updated translations. +- Drop aisleriot-theme-install.patch: fixed upstream. +- Change gnome-doc-utils-devel BuildRequires to itstool, following + the change in help build system. +- Remove --disable-scrollkeeper configure option: it doesn't exist + anymore. +- Manually list the translated help documents as %find_lang needs + to support the new XDG help system first. + ------------------------------------------------------------------- Sat Sep 17 10:50:40 UTC 2011 - jengelh@medozas.de diff --git a/aisleriot.spec b/aisleriot.spec index 08b95f1..69b7005 100644 --- a/aisleriot.spec +++ b/aisleriot.spec @@ -18,8 +18,9 @@ Name: aisleriot -Version: 3.1.1 -Release: 2 +Version: 3.1.92 +Release: 1 +# FIXME: the %%{_datadir}/help/$locale/ files should be found by %%find_lang License: GPLv3+ Summary: Solitaire Card Games for GNOME Url: http://www.gnome.org @@ -28,15 +29,13 @@ Source0: http://download.gnome.org/sources/aisleriot/3.1/%{name}-%{versio # 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 -# PATCH-FIX-UPSTREAM aisleriot-theme-install.patch bgo#648601 vuntz@opensuse.org -- Let aisleriot know that extra themes are in aisleriot-themes -Patch0: aisleriot-theme-install.patch # PATCH-FIX-UPSTREAM aisleriot-automagic-guile.patch bgo#658159 vuntz@opensuse.org -- Automatically detect version of guile Patch1: aisleriot-automagic-guile.patch # needed by patch1 BuildRequires: gnome-common -BuildRequires: gnome-doc-utils-devel BuildRequires: guile-devel BuildRequires: intltool +BuildRequires: itstool BuildRequires: lsb-release # Needed to get lsb data BuildRequires: dummy-release @@ -73,7 +72,6 @@ This package provides extra themes for Aisleriot. %lang_package %prep %setup -q -%patch0 -p1 %patch1 -p1 %build @@ -81,8 +79,7 @@ This package provides extra themes for Aisleriot. NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-schemas-install \ - --disable-static \ - --disable-scrollkeeper + --disable-static make %{?_smp_mflags} %install @@ -96,6 +93,14 @@ fi cp %{S:1} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/ %find_lang %{name} %{?no_lang_C} %find_gconf_schemas +# Localized help +for help in %{buildroot}%{_datadir}/help/*/aisleriot/; do + LOCALE=`echo $help | sed "s:.*%{_datadir}/help/\([^/]*\)/aisleriot/:\1:g"` + echo "%%lang($LOCALE) %%dir %%{_datadir}/help/$LOCALE" >> %{name}.help-lang.tmp + echo "%%lang($LOCALE) %%doc /${help##%{buildroot}}" >> %{name}.help-lang.tmp +done +echo "%%defattr(-,root,root)" > %{name}.help-lang +sort -u %{name}.help-lang.tmp | grep -v "^%%lang(C)" >> %{name}.help-lang %pre -f aisleriot.schemas_pre @@ -115,14 +120,12 @@ cp %{S:1} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/ %files -f aisleriot.schemas_list %defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING-DOCS COPYING.GPL3 -%dir %{_datadir}/gnome/ -%dir %{_datadir}/gnome/help/ -%dir %{_datadir}/gnome/help/aisleriot/ -%doc %{_datadir}/gnome/help/aisleriot/C/ -%dir %{_datadir}/omf/ -%dir %{_datadir}/omf/aisleriot/ -%doc %{_datadir}/omf/aisleriot/aisleriot-C.omf +%doc AUTHORS ChangeLog COPYING.GFDL COPYING.GPL3 COPYING.LGPL3 +%if 0%{?suse_version} <= 1140 +%doc %dir %{_datadir}/help +%doc %dir %{_datadir}/help/C +%endif +%doc %{_datadir}/help/C/aisleriot/ %{_bindir}/sol %{_datadir}/applications/freecell.desktop %{_datadir}/applications/sol.desktop @@ -152,6 +155,6 @@ cp %{S:1} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/ %{_datadir}/aisleriot/cards/gnomangelo_bitmap.svg %{_datadir}/aisleriot/cards/ornamental.svg -%files lang -f aisleriot.lang +%files lang -f aisleriot.lang -f %{name}.help-lang %changelog