- pl, unified (prof bcond etc.)

diff --git a/ghc-extensible-exceptions.spec b/ghc-extensible-exceptions.spec
index 48fc61129876c9b20d31149e1a7f148fe1d80ce2..2d6b198b6e0f6c11d97ea9c191e49f5d36b383e7 100644 (file)
--- a/ghc-extensible-exceptions.spec
+++ b/ghc-extensible-exceptions.spec
@@ -1,14 +1,21 @@
+#
+# Conditional build:
+%bcond_without prof    # profiling library
+#
 %define                pkgname extensible-exceptions
 Summary:       Extensible exceptions
+Summary(pl.UTF-8):     Rozszerzalne wyjątki
 Name:          ghc-%{pkgname}
 Version:       0.1.1.4
 Release:       2
 License:       BSD
 Group:         Development/Languages
-Source0:       http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
+#SourceDownload: http://hackage.haskell.org/package/extensible-exceptions
+Source0:       http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz
 # Source0-md5: fa1cadd15c1c7aa362618d41c6e17d8b
-URL:           http://hackage.haskell.org/package/extensible-exceptions/
+URL:           http://hackage.haskell.org/package/extensible-exceptions
 BuildRequires: ghc >= 6.12.3
+%{?with_prof:BuildRequires:    ghc-prof >= 6.12.3}
 BuildRequires: rpmbuild(macros) >= 1.608
 %requires_eq   ghc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -20,6 +27,10 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 This package provides extensible exceptions for both new and old
 versions of GHC (i.e., < 6.10).
 
+%description -l pl.UTF-8
+Ten pakiet udostępnia rozszerzalne wyjątki, zarówno dla nowych, jak i
+starych (tj. < 6.10) wersji GHC.
+
 %package prof
 Summary:       Profiling %{pkgname} library for GHC
 Summary(pl.UTF-8):     Biblioteka profilująca %{pkgname} dla GHC.
@@ -35,21 +46,22 @@ Biblioteka profilująca %{pkgname} dla GHC. Powinna być zainstalowana
 kiedy potrzebujemy systemu profilującego z GHC.
 
 %package doc
-Summary:       HTML documentation for %{pkgname}
-Summary(pl.UTF-8):     Dokumentacja w formacie HTML dla %{pkgname}
+Summary:       HTML documentation for ghc %{pkgname} package
+Summary(pl.UTF-8):     Dokumentacja w formacie HTML dla pakietu ghc %{pkgname}
 Group:         Documentation
 
 %description doc
-HTML documentation for %{pkgname}.
+HTML documentation for ghc %{pkgname} package.
 
 %description doc -l pl.UTF-8
-Dokumentacja w formacie HTML dla %{pkgname}.
+Dokumentacja w formacie HTML dla pakietu ghc %{pkgname}.
 
 %prep
 %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} \
@@ -70,7 +82,7 @@ cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc
 %{__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
@@ -85,18 +97,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_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}/HSextensible-exceptions-%{version}.o
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSextensible-exceptions-%{version}.a
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Exception
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Exception/*.hi
 
+%if %{with prof}
 %files prof
 %defattr(644,root,root,755)
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*_p.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSextensible-exceptions-%{version}_p.a
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Control/Exception/*.p_hi
+%endif
 
 %files doc
 %defattr(644,root,root,755)