Index: branches/fc13-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec =================================================================== --- branches/fc13-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec (revision 1631) +++ branches/fc13-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec (revision 1632) @@ -1,8 +1,17 @@ %global pkg_name MonadCatchIO-mtl -%bcond_without doc -%bcond_without prof +%global common_summary Haskell %{pkg_name} library -# ghc does not emit debug information +%global common_description A %{pkg_name} library for Haskell. + +# add any Haskell library dependencies here: +%global ghc_pkg_deps ghc-mtl-devel + +# add any foreign library dependencies here: +#%%global ghc_pkg_c_deps @CDEP1@-devel + +%bcond_without shared + +# debuginfo is not useful for ghc %global debug_package %{nil} @@ -10,7 +19,7 @@ Version: 0.3.0.1 Release: 0.%{scriptsversion}%{?dist} -Summary: Haskell %{pkg_name} library +Summary: %{common_summary} -Group: Development/Libraries +Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} @@ -19,53 +28,17 @@ # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros -%if %{with doc} -BuildRequires: ghc-doc -%endif -%if %{with prof} -BuildRequires: ghc-prof -%endif +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.7.0 +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %description -This package provides the Haskell %{pkg_name} library for ghc. - - -%package devel -Summary: Haskell %{pkg_name} library -Group: Development/Libraries -Requires: ghc = %{ghc_version} -Requires(post): ghc = %{ghc_version} -Requires(preun): ghc = %{ghc_version} - -%description devel -This package contains the development files for %{name} -built for ghc-%{ghc_version}. - - -%if %{with doc} -%package doc -Summary: Documentation for %{name} -Group: Development/Libraries -Requires: ghc-doc = %{ghc_version} -Requires(post): ghc-doc = %{ghc_version} -Requires(postun): ghc-doc = %{ghc_version} - -%description doc -This package contains development documentation files for -the %{name} library. +%{common_description} +%if %{with shared} +This package provides the shared library. %endif -%if %{with prof} -%package prof -Summary: Profiling libraries for %{name} -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: ghc-prof = %{ghc_version} - -%description prof -This package contains profiling libraries for %{name} -built for ghc-%{ghc_version}. -%endif +%{?ghc_lib_package} @@ -75,17 +48,10 @@ %build -%cabal_configure --ghc %{?with_prof:-p} -%cabal build -%if %{with doc} -%cabal haddock -%endif -%ghc_gen_scripts +%ghc_lib_build %install rm -rf $RPM_BUILD_ROOT -%cabal_install -%ghc_install_scripts -%ghc_gen_filelists %{name} +%ghc_lib_install @@ -94,46 +60,5 @@ -%post devel -%ghc_register_pkg - - -%if %{with doc} -%post doc -%ghc_reindex_haddock -%endif - - -%preun devel -if [ "$1" -eq 0 ] ; then - %ghc_unregister_pkg -fi - - -%if %{with doc} -%postun doc -if [ "$1" -eq 0 ] ; then - %ghc_reindex_haddock -fi -%endif - - -%files devel -f %{name}-devel.files -%defattr(-,root,root,-) -#%{_docdir}/%{name}-%{version} - - -%if %{with doc} -%files doc -f %{name}-doc.files -%defattr(-,root,root,-) -%endif - - -%if %{with prof} -%files prof -f %{name}-prof.files -%defattr(-,root,root,-) -%endif - - %changelog -* Mon Mar 15 2010 Anders Kaseorg - 0.3.0.1-0 -- initial packaging for Fedora automatically generated by cabal2spec +* Thu Sep 9 2010 Anders Kaseorg - 0.3.0.1-0 +- initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: branches/fc13-dev/server/fedora/specs/ghc-cgi.spec =================================================================== --- branches/fc13-dev/server/fedora/specs/ghc-cgi.spec (revision 1631) +++ branches/fc13-dev/server/fedora/specs/ghc-cgi.spec (revision 1632) @@ -1,8 +1,17 @@ %global pkg_name cgi -%bcond_without doc -%bcond_without prof +%global common_summary Haskell %{pkg_name} library -# ghc does not emit debug information +%global common_description A %{pkg_name} library for Haskell. + +# add any Haskell library dependencies here: +%global ghc_pkg_deps ghc-network-devel, ghc-parsec-devel, ghc-mtl-devel, ghc-MonadCatchIO-mtl-devel, ghc-xhtml-devel + +# add any foreign library dependencies here: +#%%global ghc_pkg_c_deps @CDEP1@-devel + +%bcond_without shared + +# debuginfo is not useful for ghc %global debug_package %{nil} @@ -10,7 +19,7 @@ Version: 3001.1.8.1 Release: 0.%{scriptsversion}%{?dist} -Summary: Haskell %{pkg_name} library +Summary: %{common_summary} -Group: Development/Libraries +Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} @@ -19,53 +28,17 @@ # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros, ghc-MonadCatchIO-mtl-devel -%if %{with doc} -BuildRequires: ghc-doc, ghc-MonadCatchIO-mtl-doc -%endif -%if %{with prof} -BuildRequires: ghc-prof, ghc-MonadCatchIO-mtl-prof -%endif +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.7.0 +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %description -This package provides the Haskell %{pkg_name} library for ghc. - - -%package devel -Summary: Haskell %{pkg_name} library -Group: Development/Libraries -Requires: ghc = %{ghc_version}, ghc-MonadCatchIO-mtl-devel -Requires(post): ghc = %{ghc_version}, ghc-MonadCatchIO-mtl-devel -Requires(preun): ghc = %{ghc_version}, ghc-MonadCatchIO-mtl-devel - -%description devel -This package contains the development files for %{name} -built for ghc-%{ghc_version}. - - -%if %{with doc} -%package doc -Summary: Documentation for %{name} -Group: Development/Libraries -Requires: ghc-doc = %{ghc_version}, ghc-MonadCatchIO-mtl-doc -Requires(post): ghc-doc = %{ghc_version}, ghc-MonadCatchIO-mtl-doc -Requires(postun): ghc-doc = %{ghc_version}, ghc-MonadCatchIO-mtl-doc - -%description doc -This package contains development documentation files for -the %{name} library. +%{common_description} +%if %{with shared} +This package provides the shared library. %endif -%if %{with prof} -%package prof -Summary: Profiling libraries for %{name} -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: ghc-prof = %{ghc_version}, ghc-MonadCatchIO-mtl-prof - -%description prof -This package contains profiling libraries for %{name} -built for ghc-%{ghc_version}. -%endif +%{?ghc_lib_package} @@ -75,17 +48,10 @@ %build -%cabal_configure --ghc %{?with_prof:-p} -%cabal build -%if %{with doc} -%cabal haddock -%endif -%ghc_gen_scripts +%ghc_lib_build %install rm -rf $RPM_BUILD_ROOT -%cabal_install -%ghc_install_scripts -%ghc_gen_filelists %{name} +%ghc_lib_install @@ -94,46 +60,5 @@ -%post devel -%ghc_register_pkg - - -%if %{with doc} -%post doc -%ghc_reindex_haddock -%endif - - -%preun devel -if [ "$1" -eq 0 ] ; then - %ghc_unregister_pkg -fi - - -%if %{with doc} -%postun doc -if [ "$1" -eq 0 ] ; then - %ghc_reindex_haddock -fi -%endif - - -%files devel -f %{name}-devel.files -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} - - -%if %{with doc} -%files doc -f %{name}-doc.files -%defattr(-,root,root,-) -%endif - - -%if %{with prof} -%files prof -f %{name}-prof.files -%defattr(-,root,root,-) -%endif - - %changelog -* Mon Mar 15 2010 Anders Kaseorg - 3001.1.8.1-0 -- initial packaging for Fedora automatically generated by cabal2spec +* Thu Sep 9 2010 Anders Kaseorg - 3001.1.8.1-0 +- initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: branches/fc13-dev/server/fedora/specs/ghc-unix-handle.spec =================================================================== --- branches/fc13-dev/server/fedora/specs/ghc-unix-handle.spec (revision 1631) +++ branches/fc13-dev/server/fedora/specs/ghc-unix-handle.spec (revision 1632) @@ -1,8 +1,17 @@ %global pkg_name unix-handle -%bcond_without doc -%bcond_without prof +%global common_summary Haskell %{pkg_name} library -# ghc does not emit debug information +%global common_description A %{pkg_name} library for Haskell. + +# add any Haskell library dependencies here: +#%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel + +# add any foreign library dependencies here: +#%%global ghc_pkg_c_deps @CDEP1@-devel + +%bcond_without shared + +# debuginfo is not useful for ghc %global debug_package %{nil} @@ -10,7 +19,7 @@ Version: 0.0.0 Release: 0.%{scriptsversion}%{?dist} -Summary: Haskell %{pkg_name} library +Summary: %{common_summary} -Group: Development/Libraries +Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} @@ -19,53 +28,17 @@ # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros -%if %{with doc} -BuildRequires: ghc-doc -%endif -%if %{with prof} -BuildRequires: ghc-prof -%endif +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.7.0 +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %description -This package provides the Haskell %{pkg_name} library for ghc. - - -%package devel -Summary: Haskell %{pkg_name} library -Group: Development/Libraries -Requires: ghc = %{ghc_version} -Requires(post): ghc = %{ghc_version} -Requires(preun): ghc = %{ghc_version} - -%description devel -This package contains the development files for %{name} -built for ghc-%{ghc_version}. - - -%if %{with doc} -%package doc -Summary: Documentation for %{name} -Group: Development/Libraries -Requires: ghc-doc = %{ghc_version} -Requires(post): ghc-doc = %{ghc_version} -Requires(postun): ghc-doc = %{ghc_version} - -%description doc -This package contains development documentation files for -the %{name} library. +%{common_description} +%if %{with shared} +This package provides the shared library. %endif -%if %{with prof} -%package prof -Summary: Profiling libraries for %{name} -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: ghc-prof = %{ghc_version} - -%description prof -This package contains profiling libraries for %{name} -built for ghc-%{ghc_version}. -%endif +%{?ghc_lib_package} @@ -75,17 +48,10 @@ %build -%cabal_configure --ghc %{?with_prof:-p} -%cabal build -%if %{with doc} -%cabal haddock -%endif -%ghc_gen_scripts +%ghc_lib_build %install rm -rf $RPM_BUILD_ROOT -%cabal_install -%ghc_install_scripts -%ghc_gen_filelists %{name} +%ghc_lib_install @@ -94,46 +60,5 @@ -%post devel -%ghc_register_pkg - - -%if %{with doc} -%post doc -%ghc_reindex_haddock -%endif - - -%preun devel -if [ "$1" -eq 0 ] ; then - %ghc_unregister_pkg -fi - - -%if %{with doc} -%postun doc -if [ "$1" -eq 0 ] ; then - %ghc_reindex_haddock -fi -%endif - - -%files devel -f %{name}-devel.files -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} - - -%if %{with doc} -%files doc -f %{name}-doc.files -%defattr(-,root,root,-) -%endif - - -%if %{with prof} -%files prof -f %{name}-prof.files -%defattr(-,root,root,-) -%endif - - %changelog -* Mon Mar 15 2010 Anders Kaseorg - 0.0.0-0 -- initial packaging for Fedora automatically generated by cabal2spec +* Thu Sep 9 2010 Anders Kaseorg - 0.0.0-0 +- initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: branches/fc13-dev/server/fedora/specs/scripts-static-cat.spec =================================================================== --- branches/fc13-dev/server/fedora/specs/scripts-static-cat.spec (revision 1631) +++ branches/fc13-dev/server/fedora/specs/scripts-static-cat.spec (revision 1632) @@ -1,2 +1,6 @@ +# link with shared libs +# andersk: Disabled for 3x faster startup speed. +#%%bcond_without dynamic + # ghc does not emit debug information %global debug_package %{nil} @@ -14,5 +18,7 @@ # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros, ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel +BuildRequires: ghc +BuildRequires: ghc-rpm-macros >= 0.7.0 +BuildRequires: ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel %description @@ -25,11 +31,10 @@ %build -%cabal_configure --ghc -%cabal build +%ghc_bin_build %install rm -rf $RPM_BUILD_ROOT -%cabal_install +%ghc_bin_install @@ -44,4 +49,4 @@ %changelog -* Sun Mar 14 2010 Anders Kaseorg - 0.0-0 -- initial packaging for Fedora automatically generated by cabal2spec +* Thu Sep 9 2010 Anders Kaseorg - 0.0-0 +- initial packaging for Fedora automatically generated by cabal2spec-0.22.1