- updated to 3.16.2

diff --git a/aisleriot.spec b/aisleriot.spec
index 48c668179089c19df1f78a7cd40baa9ced7019cb..14f35a8b734984868915a9655cbaf1e6a774ff69 100644 (file)
--- a/aisleriot.spec
+++ b/aisleriot.spec
@@ -1,16 +1,18 @@
 Summary:       A collection of card games
+Summary(pl.UTF-8):     Kolekcja gier karcianych
 Name:          aisleriot
-Version:       3.12.1
-Release:       2
+Version:       3.16.2
+Release:       1
 License:       GPL v3+ and LGPL v3+ and GFDL
 Group:         X11/Applications/Games
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/aisleriot/3.12/%{name}-%{version}.tar.xz
-# Source0-md5: 439d677774ffbefda6290972b48c9235
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/aisleriot/3.16/%{name}-%{version}.tar.xz
+# Source0-md5: 00a71ccef4df729178b56353453fbbcd
 URL:           https://wiki.gnome.org/Apps/Aisleriot
 BuildRequires: GConf2-devel
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.9
 BuildRequires: cairo-devel >= 1.10.0
+BuildRequires: desktop-file-utils
 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.32.0
 BuildRequires: gnome-common
@@ -20,19 +22,25 @@ BuildRequires:      intltool >= 0.40.0
 BuildRequires: itstool
 BuildRequires: libcanberra-gtk3-devel >= 0.26
 BuildRequires: librsvg-devel >= 2.32.0
+BuildRequires: libstdc++-devel
 BuildRequires: libtool
-BuildRequires: pkgconfig
+BuildRequires: libxml2-progs
+BuildRequires: pkgconfig >= 1:0.15
 BuildRequires: rpmbuild(find_lang) >= 1.35
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildRequires: yelp-tools >= 3.2.0
 Requires(post,preun):  GConf2
-Requires(post,postun): glib2 >= 1:2.26.0
+Requires(post,postun): glib2 >= 1:2.32.0
 Requires(post,postun): gtk-update-icon-cache
+Requires:      cairo >= 1.10.0
 Requires:      glib2 >= 1:2.32.0
+Requires:      gtk+3 >= 3.4.0
 Requires:      guile >= 5:2.0
 Requires:      hicolor-icon-theme
+Requires:      libcanberra-gtk3 >= 0.26
+Requires:      librsvg >= 2.32.0
 Provides:      gnome-games-sol = %{version}
 Obsoletes:     gnome-games-sol
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,6 +51,24 @@ games which are easy to play with the aid of a mouse. The rules for
 the games have been coded for your pleasure in the GNOME scripting
 language (Scheme).
 
+%description -l pl.UTF-8
+Aisleriot (znany także jako Pasjans, Solitaire lub sol) to kolekcja
+gier karcianych, łatwych do rozgrywania przy pomocy myszy. Zasady gier
+zostały zakodowane w języku skryptowym GNOME (Scheme).
+
+%package -n valgrind-aisleriot
+Summary:       Aisleriot support for Valgrind
+Summary(pl.UTF-8):     Obsługa Aisleriota dla Valgrinda
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      valgrind
+
+%description -n valgrind-aisleriot
+Aisleriot support for Valgrind.
+
+%description -n valgrind-aisleriot -l pl.UTF-8
+Obsługa Aisleriota dla Valgrinda.
+
 %prep
 %setup -q
 
@@ -53,7 +79,7 @@ language (Scheme).
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure \
+bash %configure \
        --disable-silent-rules \
        --with-pysol-card-theme-path=%{_datadir}/pysol \
        --with-guile="2.0"
@@ -93,8 +119,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/aisleriot/guile
 %{_sysconfdir}/gconf/schemas/aisleriot.schemas
 %{_datadir}/aisleriot
+%{_datadir}/appdata/sol.appdata.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.Patience.WindowState.gschema.xml
 %{_desktopdir}/sol.desktop
-%{_iconsdir}/hicolor/*/*/*.png
-%{_iconsdir}/HighContrast/scalable/*/*.svg
+%{_iconsdir}/hicolor/*x*/apps/gnome-aisleriot.png
+%{_iconsdir}/hicolor/*x*/apps/gnome-freecell.png
+%{_iconsdir}/hicolor/symbolic/apps/gnome-aisleriot-symbolic.svg
 %{_mandir}/man6/sol.6*
+
+%files -n valgrind-aisleriot
+%defattr(644,root,root,755)
+%{_libdir}/valgrind/aisleriot.supp