diff --git a/.gitignore b/.gitignore index 56fa23d..c7ee3d0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /snap-core-0.9.4.0.tar.gz /snap-core-0.9.6.3.tar.gz /snap-core-0.9.6.4.tar.gz +/snap-core-1.0.0.0.tar.gz diff --git a/ghc-snap-core.spec b/ghc-snap-core.spec index 4986973..95d48fb 100644 --- a/ghc-snap-core.spec +++ b/ghc-snap-core.spec @@ -1,18 +1,21 @@ +# generated by cabal-rpm-0.10.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name snap-core +%global time_locale_compat_version 0.1.1.3 Name: ghc-%{pkg_name} -Version: 0.9.6.4 -Release: 3%{?dist} +Version: 0.9.8.0 +Release: 1%{?dist} Summary: Snap web framework core library License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: http://hackage.haskell.org/package/time-compat-%{time_locale_compat_version}/time-locale-compat-%{time_locale_compat_version}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra >= 1.6.4 # Begin cabal-rpm deps: BuildRequires: ghc-HUnit-devel BuildRequires: ghc-MonadCatchIO-transformers-devel @@ -29,11 +32,11 @@ BuildRequires: ghc-enumerator-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-mtl-devel -BuildRequires: ghc-old-locale-devel BuildRequires: ghc-random-devel BuildRequires: ghc-regex-posix-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel +BuildRequires: ghc-time-locale-compat-devel BuildRequires: ghc-unix-compat-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel @@ -47,6 +50,15 @@ in Haskell. This library contains the core definitions and types for the Snap framework. +%global snap_core_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage time-locale-compat %{time_locale_compat_version} +%endif + +%global version %{snap_core_version} + + %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} @@ -60,24 +72,17 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -c -n %{pkg_name}-%{version} -a1 %patch1 -p1 -b .orig %build -%ghc_lib_build - - -# requires pureMD5 and test-framework* -#%%check -#cd test -#../Setup configure -#../Setup build -#./runTestsAndCoverage.sh +%ghc_libs_build time-locale-compat-%{time_locale_compat_version} %{pkg_name}-%{version} %install -%ghc_lib_install +%ghc_libs_install time-locale-compat-%{time_locale_compat_version} %{pkg_name}-%{version} + %post devel @@ -89,14 +94,16 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%doc LICENSE %files devel -f %{name}-devel.files -%doc CONTRIBUTORS README*.md +%doc %{pkg_name}-%{version}/README.SNAP.md %{pkg_name}-%{version}/README.md %changelog +* Thu Aug 25 2016 Jens Petersen - 1.0.0.0-1 +- update to 1.0.0.0 + * Wed Feb 03 2016 Fedora Release Engineering - 0.9.6.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index c70fbda..1be2161 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b74c22a6629dccaae73cd6eb16a56c0 snap-core-0.9.6.4.tar.gz +66f060d64590b9f16a413d48e074aabd snap-core-1.0.0.0.tar.gz