Accepting request 85589 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/85589
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aisleriot?expand=0&rev=8

aisleriot-3.1.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:61a93c95f1ea470b64ba10e65edb966c03d7afebff82e5a5f5c6e15cbcce096f
-size 5484674

aisleriot-3.2.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cf5aafc5e55f5398075b0a23707c8b85dcc30105148b4aa4f5fa6840ceb2363
+size 5455268

aisleriot-theme-install.patch

@@ -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;
- 

aisleriot.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Mon Sep 26 13:40:28 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.2.0:
+  + Update card theme install info for debian (bgo#659997)
+  + Updated translations.
+
+-------------------------------------------------------------------
+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
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+
 -------------------------------------------------------------------
 Sun Sep  4 08:04:02 UTC 2011 - vuntz@opensuse.org
 

aisleriot.spec

@@ -18,25 +18,24 @@
 
 
 Name:           aisleriot
-Version:        3.1.1
+Version:        3.2.0
-Release:        2
+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
 Group:          Amusements/Games/Board/Card
-Source0:        http://download.gnome.org/sources/aisleriot/3.1/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/aisleriot/3.2/%{name}-%{version}.tar.bz2
 # 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,9 +79,8 @@ This package provides extra themes for Aisleriot.
 NOCONFIGURE=1 gnome-autogen.sh
 %configure \
     --disable-schemas-install \
-    --disable-static \
+    --disable-static
-    --disable-scrollkeeper
+make %{?_smp_mflags}
-%__make %{?jobs:-j%jobs}
 
 %install
 %make_install
@@ -96,9 +93,14 @@ fi
 cp %{S:1} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/
 %find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
-
+# Localized help
-%clean
+for help in %{buildroot}%{_datadir}/help/*/aisleriot/; do
-rm -rf %{buildroot}
+    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
 
@@ -118,14 +120,12 @@ rm -rf %{buildroot}
 
 %files -f aisleriot.schemas_list
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING-DOCS COPYING.GPL3
+%doc AUTHORS ChangeLog COPYING.GFDL COPYING.GPL3 COPYING.LGPL3
-%dir %{_datadir}/gnome/
+%if 0%{?suse_version} <= 1140
-%dir %{_datadir}/gnome/help/
+%doc %dir %{_datadir}/help
-%dir %{_datadir}/gnome/help/aisleriot/
+%doc %dir %{_datadir}/help/C
-%doc %{_datadir}/gnome/help/aisleriot/C/
+%endif
-%dir %{_datadir}/omf/
+%doc %{_datadir}/help/C/aisleriot/
-%dir %{_datadir}/omf/aisleriot/
-%doc %{_datadir}/omf/aisleriot/aisleriot-C.omf
 %{_bindir}/sol
 %{_datadir}/applications/freecell.desktop
 %{_datadir}/applications/sol.desktop
@@ -155,6 +155,6 @@ rm -rf %{buildroot}
 %{_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