Index: /branches/fc15-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec =================================================================== --- /branches/fc15-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec (revision 1838) +++ /branches/fc15-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec (revision 1839) @@ -1,21 +1,12 @@ -# For Haskell Packaging Guidelines see: -# - https://fedoraproject.org/wiki/Packaging:Haskell -# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell - %global pkg_name MonadCatchIO-mtl -# common part of summary for all the subpackages %global common_summary Haskell %{pkg_name} library -# main description used for all the subpackages %global common_description A %{pkg_name} library for Haskell. -# add any Haskell library dependencies here: +# add any Haskell library dependencies here: %global ghc_pkg_deps ghc-mtl-devel -# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) -#%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel - -# foreign library dependencies (used for buildrequires and devel subpkg requires) +# add any foreign library dependencies here: #%%global ghc_pkg_c_deps @CDEP1@-devel @@ -26,18 +17,17 @@ Name: ghc-%{pkg_name} -Version: 0.3.0.2 -Release: 1.%{scriptsversion}%{?dist} +Version: 0.3.0.1 +Release: 0.%{scriptsversion}%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} +URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 +ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof -# macros for building haskell packages -BuildRequires: ghc-rpm-macros >= 0.7.3 -BuildRequires: hscolour +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}} @@ -45,4 +35,10 @@ %description %{common_description} +%if %{with shared} +This package provides the shared library. +%endif + + +%{?ghc_lib_package} @@ -56,16 +52,13 @@ %install +rm -rf $RPM_BUILD_ROOT %ghc_lib_install -# define the devel and prof subpkgs, devel post[un] scripts, and filelists: -# ghc-%pkg_name{,devel,prof}.files -%ghc_lib_package +%clean +rm -rf $RPM_BUILD_ROOT %changelog -* Sat Apr 16 2011 Alexander Chernyakhovsky - 0.3.0.2-1 -- regenerated packaging for Fedora automatically generated by cabal2spec-0.22.5 - * Thu Sep 9 2010 Anders Kaseorg - 0.3.0.1-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: /branches/fc15-dev/server/fedora/specs/ghc-cgi.spec =================================================================== --- /branches/fc15-dev/server/fedora/specs/ghc-cgi.spec (revision 1838) +++ /branches/fc15-dev/server/fedora/specs/ghc-cgi.spec (revision 1839) @@ -1,22 +1,21 @@ -# For Haskell Packaging Guidelines see: -# - https://fedoraproject.org/wiki/Packaging:Haskell -# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell - %global pkg_name cgi -# common part of summary for all the subpackages %global common_summary Haskell %{pkg_name} library -# main description used for all the subpackages %global common_description A %{pkg_name} library for Haskell. -# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) +# 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 -# foreign library dependencies (used for buildrequires and devel subpkg requires) +# 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} + Name: ghc-%{pkg_name} -Version: 3001.1.8.2 +Version: 3001.1.8.1 Release: 0.%{scriptsversion}%{?dist} Summary: %{common_summary} @@ -24,12 +23,11 @@ Group: System Environment/Libraries License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} +URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 +ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof -# macros for building haskell packages -BuildRequires: ghc-rpm-macros >= 0.7.3 -BuildRequires: hscolour +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}} @@ -37,4 +35,10 @@ %description %{common_description} +%if %{with shared} +This package provides the shared library. +%endif + + +%{?ghc_lib_package} @@ -48,16 +52,13 @@ %install +rm -rf $RPM_BUILD_ROOT %ghc_lib_install -# define the devel and prof subpkgs, devel post[un] scripts, and filelists: -# ghc-%pkg_name{,devel,prof}.files -%ghc_lib_package +%clean +rm -rf $RPM_BUILD_ROOT %changelog -* Sat Apr 16 2011 Alexander Chernyakhovsky - 3001.1.8.2-0 -- regenerated with cabal2spec-0.22.5 - * Thu Sep 9 2010 Anders Kaseorg - 3001.1.8.1-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: /branches/fc15-dev/server/fedora/specs/ghc-unix-handle.spec =================================================================== --- /branches/fc15-dev/server/fedora/specs/ghc-unix-handle.spec (revision 1838) +++ /branches/fc15-dev/server/fedora/specs/ghc-unix-handle.spec (revision 1839) @@ -1,19 +1,18 @@ -# For Haskell Packaging Guidelines see: -# - https://fedoraproject.org/wiki/Packaging:Haskell -# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell - %global pkg_name unix-handle -# common part of summary for all the subpackages %global common_summary Haskell %{pkg_name} library -# main description used for all the subpackages %global common_description A %{pkg_name} library for Haskell. -# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) +# add any Haskell library dependencies here: #%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel -# foreign library dependencies (used for buildrequires and devel subpkg requires) +# 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} Name: ghc-%{pkg_name} @@ -24,12 +23,11 @@ Group: System Environment/Libraries License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} +URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 +ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof -# macros for building haskell packages -BuildRequires: ghc-rpm-macros >= 0.7.3 -BuildRequires: hscolour +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}} @@ -37,4 +35,10 @@ %description %{common_description} +%if %{with shared} +This package provides the shared library. +%endif + + +%{?ghc_lib_package} @@ -48,16 +52,13 @@ %install +rm -rf $RPM_BUILD_ROOT %ghc_lib_install -# define the devel and prof subpkgs, devel post[un] scripts, and filelists: -# ghc-%pkg_name{,devel,prof}.files -%ghc_lib_package +%clean +rm -rf $RPM_BUILD_ROOT %changelog -* Sat Apr 30 2011 Alexander Chernyakhovsky - 0.0.0-0 -- regenerated packaging for Fedora automatically generated by cabal2spec-0.22.5 - * Thu Sep 9 2010 Anders Kaseorg - 0.0.0-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: /branches/fc15-dev/server/fedora/specs/scripts-static-cat.spec =================================================================== --- /branches/fc15-dev/server/fedora/specs/scripts-static-cat.spec (revision 1838) +++ /branches/fc15-dev/server/fedora/specs/scripts-static-cat.spec (revision 1839) @@ -1,5 +1,8 @@ -# For Haskell Packaging Guidelines see: -# - https://fedoraproject.org/wiki/Packaging:Haskell -# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell +# link with shared libs +# andersk: Disabled for 3x faster startup speed. +#%%bcond_without dynamic + +# ghc does not emit debug information +%global debug_package %{nil} Name: scripts-static-cat @@ -10,11 +13,10 @@ Group: Applications/System License: GPL -URL: http://scripts.mit.edu +URL: http://scripts.mit.edu/ Source0: %{name}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 -BuildRequires: ghc-devel -# macros for building haskell packages +ExclusiveArch: %{ix86} x86_64 ppc alpha +BuildRequires: ghc BuildRequires: ghc-rpm-macros >= 0.7.0 BuildRequires: ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel @@ -33,5 +35,10 @@ %install +rm -rf $RPM_BUILD_ROOT %ghc_bin_install + + +%clean +rm -rf $RPM_BUILD_ROOT @@ -42,7 +49,4 @@ %changelog -* Sat Apr 30 2011 Alexander Chernyakhovsky - 0.0-0 -- regenerated packaging for Fedora automatically generated by cabal2spec-0.22.5 - * Thu Sep 9 2010 Anders Kaseorg - 0.0-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1