- pl, unified, added prof bcond, release 4

diff --git a/ghc-json.spec b/ghc-json.spec
index 2256ad6a2f4724f7bf504501402d5fce79d2f7ea..95e7909a9eed26a45b44abc2b08331e13c2a111a 100644 (file)
--- a/ghc-json.spec
+++ b/ghc-json.spec
@@ -1,42 +1,75 @@
+#
+# Conditional build:
+%bcond_without prof    # profiling library
+#
 %define                pkgname json
 Summary:       Support for serialising Haskell to and from JSON
+Summary(pl.UTF-8):     Obsługa serializacji Haskella do i z formatu JSON
 Name:          ghc-%{pkgname}
 Version:       0.7
-Release:       3
+Release:       4
 License:       BSD
 Group:         Development/Languages
-Source0:       http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
+#Source0Download: http://hackage.haskell.org/package/json
+Source0:       http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz
 # Source0-md5: bfa338cafdc88b0f6c9897bb4917e48a
-URL:           http://hackage.haskell.org/package/json/
+URL:           http://hackage.haskell.org/package/json
 BuildRequires: ghc >= 6.12.3
-BuildRequires: ghc-prof
-BuildRequires: ghc-haskell-platform
-BuildRequires: ghc-haskell-platform-prof
+BuildRequires: ghc-array
+BuildRequires: ghc-base >= 3
+BuildRequires: ghc-bytestring
+BuildRequires: ghc-containers
+BuildRequires: ghc-mtl
+BuildRequires: ghc-text
+%if %{with prof}
+BuildRequires: ghc-prof >= 6.12.3
+BuildRequires: ghc-array-prof
+BuildRequires: ghc-base-prof >= 3
+BuildRequires: ghc-bytestring-prof
+BuildRequires: ghc-containers-prof
+BuildRequires: ghc-mtl-prof
+BuildRequires: ghc-text-prof
+%endif
 BuildRequires: rpmbuild(macros) >= 1.608
-%requires_releq        ghc
 Requires(post,postun): /usr/bin/ghc-pkg
-Requires:      ghc-haskell-platform
+%requires_releq        ghc
+Requires:      ghc-array
+Requires:      ghc-base >= 3
+Requires:      ghc-bytestring
+Requires:      ghc-containers
+Requires:      ghc-mtl
+Requires:      ghc-text
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # debuginfo is not useful for ghc
 %define                _enable_debug_packages  0
 
-# don't compress haddoc files
+# don't compress haddock files
 %define                _noautocompressdoc      *.haddock
 
 %description
 This library provides a parser and pretty printer for converting
 between Haskell values and JSON.
 
+%description -l pl.UTF-8
+Ta biblioteka udostępnia parser oraz funkcję wypisującą (pretty
+printer) do konwersji między wartościami Haskella a formatem JSON.
+
 %package prof
 Summary:       Profiling %{pkgname} library for GHC
 Summary(pl.UTF-8):     Biblioteka profilująca %{pkgname} dla GHC.
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      ghc-array-prof
+Requires:      ghc-base-prof >= 3
+Requires:      ghc-bytestring-prof
+Requires:      ghc-containers-prof
+Requires:      ghc-mtl-prof
+Requires:      ghc-text-prof
 
 %description prof
-Profiling %{pkgname} library for GHC.  Should be installed when
-GHC's profiling subsystem is needed.
+Profiling %{pkgname} library for GHC. Should be installed when GHC's
+profiling subsystem is needed.
 
 %description prof -l pl.UTF-8
 Biblioteka profilująca %{pkgname} dla GHC. Powinna być zainstalowana
@@ -46,7 +79,8 @@ kiedy potrzebujemy systemu profilującego z GHC.
 %setup -q -n %{pkgname}-%{version}
 
 %build
-runhaskell Setup.hs configure -v2 --enable-library-profiling \
+runhaskell Setup.hs configure -v2 \
+       %{?with_prof:--enable-library-profiling} \
        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
        --libexecdir=%{_libexecdir} \
@@ -62,12 +96,12 @@ install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d
 runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT
 
 # work around automatic haddock docs installation
-rm -rf %{name}-%{version}-doc
+%{__rm} -rf %{name}-%{version}-doc
 cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 runhaskell Setup.hs register \
-       --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
+       --gen-pkg-config=$RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,13 +114,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES
-%doc %{name}-%{version}-doc/*
+%doc CHANGES %{name}-%{version}-doc/*
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.o
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.a
-%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*_p.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/HSjson-%{version}.o
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSjson-%{version}.a
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/*.hi
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/JSON
@@ -94,8 +126,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files prof
 %defattr(644,root,root,755)
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*_p.a
-%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSjson-%{version}_p.a
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/*.p_hi
-%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/JSON
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/JSON/*.p_hi