- up to 1.6.0.0

diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec
index 161dacfddb8aa9154d935b0ce0de1f294fd6d8f3..ef0e48a184bdaf359638b2c9f7702f9b08e97bb9 100644 (file)
--- a/ghc-HUnit.spec
+++ b/ghc-HUnit.spec
@@ -6,29 +6,29 @@
 Summary:       A unit testing framework for Haskell
 Summary(pl.UTF-8):     Szkielet testów jednostkowych dla Haskella
 Name:          ghc-%{pkgname}
-Version:       1.2.5.2
+Version:       1.6.0.0
 Release:       1
 License:       BSD
 Group:         Development/Languages
 #Source0Download: http://hackage.haskell.org/package/HUnit
 Source0:       http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz
-# Source0-md5: 1ba79aaeb57361a8593e864694539025
-URL:           http://hunit.sourceforge.net/
+# Source0-md5: 4c7fbdab4e57eef5776640a3f97d10ce
+URL:           http://hackage.haskell.org/package/HUnit
 BuildRequires: ghc >= 6.12.3
 BuildRequires: ghc-base >= 3
-BuildRequires: ghc-base < 5
+BuildRequires: ghc-call-stack
 BuildRequires: ghc-deepseq
 %if %{with prof}
 BuildRequires: ghc-prof >= 6.12.3
 BuildRequires: ghc-base-prof >= 3
-BuildRequires: ghc-base-prof < 5
+BuildRequires: ghc-call-stack-prof
 BuildRequires: ghc-deepseq-prof
 %endif
 BuildRequires: rpmbuild(macros) >= 1.608
 Requires(post,postun): /usr/bin/ghc-pkg
 %requires_eq   ghc
 Requires:      ghc-base >= 3
-Requires:      ghc-base < 5
+Requires:      ghc-call-stack
 Requires:      ghc-deepseq
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -52,7 +52,7 @@ Summary(pl.UTF-8):    Biblioteka profilująca %{pkgname} dla GHC
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      ghc-base-prof >= 3
-Requires:      ghc-base-prof < 5
+Requires:      ghc-call-stack-prof
 Requires:      ghc-deepseq-prof
 
 %description prof
@@ -78,28 +78,28 @@ Dokumentacja w formacie HTML dla pakietu ghc %{pkgname}.
 %setup -q -n %{pkgname}-%{version}
 
 %build
-runhaskell Setup.hs configure -v2 \
+runhaskell Setup.lhs configure -v2 \
        %{?with_prof:--enable-library-profiling} \
        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
        --libexecdir=%{_libexecdir} \
        --docdir=%{_docdir}/%{name}-%{version}
 
-runhaskell Setup.hs build
-runhaskell Setup.hs haddock --executables
+runhaskell Setup.lhs build
+runhaskell Setup.lhs haddock --executables
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d
 
-runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT
+runhaskell Setup.lhs copy --destdir=$RPM_BUILD_ROOT
 
 # work around automatic haddock docs installation
 %{__rm} -rf %{name}-%{version}-doc
 cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
-runhaskell Setup.hs register \
+runhaskell Setup.lhs register \
        --gen-pkg-config=$RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 
 %clean
@@ -113,21 +113,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE README
+%doc CHANGELOG.md LICENSE README.md
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/HSHUnit-%{version}.o
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSHUnit-%{version}.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSHUnit-%{version}-*.so
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSHUnit-%{version}-*.a
+%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSHUnit-%{version}-*_p.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.dyn_hi
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Test
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Test/HUnit.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Test/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Test/*.dyn_hi
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Test/HUnit
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Test/HUnit/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Test/HUnit/*.dyn_hi
 
 %if %{with prof}
 %files prof
 %defattr(644,root,root,755)
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSHUnit-%{version}_p.a
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Test/HUnit.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSHUnit-%{version}-*_p.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Test/*.p_hi
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Test/HUnit/*.p_hi
 %endif