- up to 3.22.26

diff --git a/aisleriot.spec b/aisleriot.spec
index ed8bb06e9ef4129a3a879d5a1eac0844fc0460c2..db04e7f69a4da3050aab66bd768836ee42296645 100644 (file)
--- a/aisleriot.spec
+++ b/aisleriot.spec
@@ -5,26 +5,20 @@
 Summary:       A collection of card games
 Summary(pl.UTF-8):     Kolekcja gier karcianych
 Name:          aisleriot
-Version:       3.22.9
-Release:       2
+Version:       3.22.26
+Release:       1
 License:       GPL v3+ and LGPL v3+ and GFDL
 Group:         X11/Applications/Games
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/aisleriot/3.22/%{name}-%{version}.tar.xz
-# Source0-md5: 121678a799d027640ddfb267384440b5
-Patch0:                guile3.0.patch
+Source0:       https://gitlab.gnome.org/GNOME/aisleriot/-/archive/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: 77f03df941fe9236652e68a9d79490d7
 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: lsb-release
 BuildRequires: cairo-devel >= 1.10.0
 BuildRequires: desktop-file-utils
 BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.32.0
-BuildRequires: gnome-common
 BuildRequires: gtk+3-devel >= 3.18.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
@@ -33,11 +27,10 @@ BuildRequires:      libtool >= 2:2.2
 BuildRequires: libxml2-progs
 BuildRequires: pkgconfig >= 1:0.15
 BuildRequires: rpmbuild(find_lang) >= 1.35
-BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: rpmbuild(macros) >= 2.000
 BuildRequires: tar >= 1:1.22
-BuildRequires: xz
+BuildRequires: bzip2
 BuildRequires: yelp-tools >= 3.2.0
-Requires(post,preun):  GConf2 >= 2.0
 Requires(post,postun): glib2 >= 1:2.32.0
 Requires(post,postun): gtk-update-icon-cache
 Requires:      cairo >= 1.10.0
@@ -77,28 +70,23 @@ Obsługa Aisleriota dla Valgrinda.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-bash %configure \
-       --disable-silent-rules \
-       --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="3.0"
-%{__make} -j1
+%{__meson} build \
+       -Dtheme_kde=false \
+       %{?with_qt:-Dtheme_svg_qtsvg=true -Dtheme_kde=true -Dtheme_kde_path=%{_datadir}/apps/carddecks} \
+       -Dtheme_pysol=true \
+       -Dtheme_pysol_path=%{_datadir}/pysol \
+       -Dprefix=/usr \
+       -Dbuildtype=debugoptimized
+
+cd build
+%{ninja_build}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+cd  build
+%{ninja_install} 
 
 %find_lang %{name} --with-gnome
 
@@ -119,9 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %update_icon_cache hicolor
 %glib_compile_schemas
 
-%files -f %{name}.lang
+%files -f build/%{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS TODO
+%doc AUTHORS TODO
 %attr(755,root,root) %{_bindir}/sol
 %if "%{_libexecdir}" != "%{_libdir}"
 %dir %{_libexecdir}/aisleriot
@@ -129,10 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/aisleriot/ar-cards-renderer
 %dir %{_libdir}/aisleriot
 %{_libdir}/aisleriot/guile
-%{_sysconfdir}/gconf/schemas/aisleriot.schemas
 %{_datadir}/aisleriot
 %{_datadir}/glib-2.0/schemas/org.gnome.Patience.WindowState.gschema.xml
-%{_datadir}/metainfo/sol.appdata.xml
+/usr/share/metainfo/sol.metainfo.xml
 %{_desktopdir}/sol.desktop
 %{_iconsdir}/hicolor/*x*/apps/gnome-aisleriot.png
 %{_iconsdir}/hicolor/*x*/apps/gnome-freecell.png