X-Git-Url: http://git.pld-linux.org/?p=packages%2Faisleriot.git;a=blobdiff_plain;f=aisleriot.spec;h=e18866ee432678222e8933f3c022a280f2534f85;hp=8223be8e38b74974a7887dc30282159190c3483b;hb=ffbb2f400f1183ae396eb5841cf79850c1126d96;hpb=f01a19ebd737cc7c7bf7bc3b6533bcc89b7acce3

diff --git a/aisleriot.spec b/aisleriot.spec
index 8223be8..e18866e 100644
--- a/aisleriot.spec
+++ b/aisleriot.spec
@@ -1,36 +1,51 @@
+#
+# Conditional build:
+%bcond_with	qt	# Support for QtSvg based formats (kde,native)
+#
 Summary:	A collection of card games
+Summary(pl.UTF-8):	Kolekcja gier karcianych
 Name:		aisleriot
-Version:	3.2.2
+Version:	3.22.7
 Release:	1
 License:	GPL v3+ and LGPL v3+ and GFDL
 Group:		X11/Applications/Games
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/aisleriot/3.2/%{name}-%{version}.tar.xz
-# Source0-md5:	cf8f6a8c51e54a9f8945a02b521dd40a
-URL:		http://live.gnome.org/Aisleriot
-BuildRequires:	GConf2-devel
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/aisleriot/3.22/%{name}-%{version}.tar.xz
+# Source0-md5:	d62c15ea4e30afcda4fd94e8f440336e
+URL:		https://wiki.gnome.org/Apps/Aisleriot
+BuildRequires:	GConf2-devel >= 2.0
+%{?with_qt:BuildRequires:	Qt5Svg-devel >= 5.0.0}
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	cairo-devel >= 1.10.0
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.26.0
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.32.0
 BuildRequires:	gnome-common
-BuildRequires:	gtk+3-devel >= 3.0.0
-BuildRequires:	guile-devel >= 5:2.0
+BuildRequires:	gtk+3-devel >= 3.4.0
+BuildRequires:	guile-devel >= 5:2.2
 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,preun):	GConf2 >= 2.0
+Requires(post,postun):	glib2 >= 1:2.32.0
 Requires(post,postun):	gtk-update-icon-cache
-Requires:	guile >= 5:2.0
+Requires:	cairo >= 1.10.0
+Requires:	glib2 >= 1:2.32.0
+Requires:	gtk+3 >= 3.4.0
+Requires:	guile >= 5:2.2
 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)
@@ -41,6 +56,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
 
@@ -51,9 +84,12 @@ language (Scheme).
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure \
+bash %configure \
 	--disable-silent-rules \
-	--with-guile="2.0"
+	--with-card-theme-formats=svg,fixed,pysol%{?with_qt:,kde,native} \
+	--with-kde-card-theme-path=%{_datadir}/apps/carddecks \
+	--with-pysol-card-theme-path=%{_datadir}/pysol \
+	--with-guile="2.2"
 %{__make} -j1
 
 %install
@@ -68,6 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%update_icon_cache HighContrast
 %update_icon_cache hicolor
 %gconf_schema_install aisleriot.schemas
 %glib_compile_schemas
@@ -76,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_uninstall aisleriot.schemas
 
 %postun
+%update_icon_cache HighContrast
 %update_icon_cache hicolor
 %glib_compile_schemas
 
@@ -83,12 +121,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS TODO
 %attr(755,root,root) %{_bindir}/sol
-%dir %{_libdir}/aisleriot
-%attr(755,root,root) %{_libdir}/aisleriot/ar-cards-renderer
+%dir %{_libexecdir}/aisleriot
+%attr(755,root,root) %{_libexecdir}/aisleriot/ar-cards-renderer
+%{_libdir}/aisleriot/guile
 %{_sysconfdir}/gconf/schemas/aisleriot.schemas
 %{_datadir}/aisleriot
 %{_datadir}/glib-2.0/schemas/org.gnome.Patience.WindowState.gschema.xml
-%{_desktopdir}/freecell.desktop
+%{_datadir}/metainfo/sol.appdata.xml
 %{_desktopdir}/sol.desktop
-%{_iconsdir}/hicolor/*/*/*.png
+%{_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