- rebased to current HEAD

xs.spec

@@ -1,21 +1,27 @@
-%global githash c9a0b29
+%global commit0 fc45d1fa6995705c8ac6d78cf102a6aac682828f
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
+# workaround upstream expectations in test-suite
+%global _vpath_builddir build
+
 
 Name:		xs
 Version:	0.1
-Release:	25.git%{githash}%{?dist}
+Release:	26.git%{shortcommit0}%{?dist}
 Summary:	Shell supporting functional programming
 
 License:	Public Domain
-URL:		https://github.com/frytvm/XS
-# downloaded from https://github.com/frytvm/XS/tarball/master
-Source0:	frytvm-XS-%{githash}.tar.gz
+URL:		https://github.com/TieDyedDevil/XS
+Source0:	https://github.com/TieDyedDevil/XS/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
 
-BuildRequires:	automake
+BuildRequires:	meson
 BuildRequires:	bison
 BuildRequires:	boost-devel
 BuildRequires:	gc-devel
+BuildRequires:	libffi-devel
 BuildRequires:	gcc-c++
 BuildRequires:	readline-devel
+BuildRequires:	git
 
 %description
 Xs is a cleanly-designed shell with functional programming.  It is based off
@@ -30,30 +36,41 @@ Frederic Koehler.
 
 
 %prep
-%setup -q -n frytvm-XS-%{githash}
+%setup -q -n XS-%{commit0}
+
+# workaround upstream buildsystem, it requires to have an actual git checkout ...
+git init
+git config user.email "xs-owner@fedoraproject.org"
+git config user.name "Fedora XS owner"
+git add .
+git commit -a -q -m "upstream commit %{shortcommit0}"
+git remote add origin "%URL"
 
 
 %build
-autoreconf -i
-%configure
-make %{?_smp_mflags}
+%meson
+%meson_build
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%meson_install
 
 
 %check
-make testxs
+# upstream uses "check" instead of "test"
+%{__ninja} check %{__ninja_common_opts} -C %{_vpath_builddir}
 
 
 %files
-%doc COPYING README
 %{_bindir}/xs
 %{_mandir}/man1/xs.1*
+%{_pkgdocdir}/
 
 
 %changelog
+* Wed May 24 2017 Dan Horák <dan[at]danny.cz> - 0.1-26.gitfc45d1f
+- rebased to current HEAD
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-25.gitc9a0b29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild