From 51ef2e68ee01d0d4b89b5a7ad5f69681f9fdbf2d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Sep 2015 15:56:36 +0900 Subject: [PATCH] use %license, disable testsuite --- alex.spec | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/alex.spec b/alex.spec index dfcfb00..dd210e0 100644 --- a/alex.spec +++ b/alex.spec @@ -1,20 +1,19 @@ # https://fedoraproject.org/wiki/Packaging:Haskell -%bcond_without tests +# should get fixed in 3.1.5 +# https://github.com/simonmar/alex/issues/62 +%bcond_with tests %bcond_without static -# no useful debuginfo for Haskell packages without C sources -%global debug_package %{nil} - Name: alex # part of haskell-platform Version: 3.1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for generating lexical analysers in Haskell License: BSD -URL: http://hackage.haskell.org/package/%{name} -Source0: http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +Url: https://hackage.haskell.org/package/%{name} +Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -88,9 +87,10 @@ cd .. mv %{buildroot}%{_bindir}/%{name}{,.dynamic} install dist/build/%{name}/%{name}.static %{buildroot}%{_bindir} touch %{buildroot}%{_bindir}/%{name} -rm %{buildroot}%{_pkgdocdir}/LICENSE %endif +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %check %if %{with tests} @@ -145,7 +145,8 @@ fi %ghost %{_bindir}/%{name} %{_bindir}/%{name}.dynamic %else -%doc ANNOUNCE LICENSE README TODO doc/alex examples +%license LICENSE +%doc ANNOUNCE README TODO doc/alex examples %{_bindir}/%{name} %{_datadir}/%{name}-%{version} %endif @@ -153,7 +154,8 @@ fi %if %{with static} %files common -%doc ANNOUNCE LICENSE README TODO doc/alex examples +%license LICENSE +%doc ANNOUNCE README TODO doc/alex examples %{_datadir}/%{name}-%{version} @@ -164,6 +166,10 @@ fi %changelog +* Thu Sep 17 2015 Jens Petersen - 3.1.4-3 +- use license macro +- disable testsuite for 3.1.4 + * Tue Jun 16 2015 Fedora Release Engineering - 3.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild