Index: branches/fc17-dev/server/fedora/Makefile =================================================================== --- branches/fc17-dev/server/fedora/Makefile (revision 2210) +++ branches/fc17-dev/server/fedora/Makefile (revision 2211) @@ -20,6 +20,6 @@ upstream_yum = krb5 krb5.i686 httpd openssh rubygems -hackage = MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0 -upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle +hackage = cgi-3001.1.8.2 unix-handle-0.0.0 +upstream_hackage = ghc-cgi ghc-unix-handle upstream = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr python-afs athena-aclocal discuss oursrc = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat fuse-better-mousetrapfs Index: branches/fc17-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec =================================================================== --- branches/fc17-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec (revision 2210) +++ (revision ) @@ -1,63 +1,0 @@ -# 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. - -# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) -%global ghc_pkg_deps ghc-mtl-devel - -# foreign library dependencies (used for buildrequires and devel subpkg requires) -#%%global ghc_pkg_c_deps @CDEP1@-devel - -Name: ghc-%{pkg_name} -Version: 0.3.0.2 -Release: 0.%{scriptsversion}%{?dist} -Summary: %{common_summary} - -Group: System Environment/Libraries -License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 -BuildRequires: ghc, ghc-doc, ghc-prof -# macros for building haskell packages -BuildRequires: ghc-rpm-macros >= 0.7.3 -BuildRequires: hscolour -%{?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 -%{common_description} - - -%prep -%setup -q -n %{pkg_name}-%{version} - - -%build -%ghc_lib_build - - -%install -%ghc_lib_install - - -# define the devel and prof subpkgs, devel post[un] scripts, and filelists: -# ghc-%pkg_name{,devel,prof}.files -%ghc_lib_package - - -%changelog -* Mon May 2 2011 Alexander Chernyakhovsky - 0.3.0.2-0 -- regenerated packaging with 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/fc17-dev/server/fedora/specs/ghc-cgi.spec =================================================================== --- branches/fc17-dev/server/fedora/specs/ghc-cgi.spec (revision 2210) +++ branches/fc17-dev/server/fedora/specs/ghc-cgi.spec (revision 2211) @@ -1,19 +1,11 @@ -# For Haskell Packaging Guidelines see: -# - https://fedoraproject.org/wiki/Packaging:Haskell -# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell +# cabal2spec-0.25 +# 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) -%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) -#%%global ghc_pkg_c_deps @CDEP1@-devel Name: ghc-%{pkg_name} @@ -24,14 +16,16 @@ Group: System Environment/Libraries License: BSD +# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 -BuildRequires: ghc, ghc-doc, ghc-prof -# macros for building haskell packages -BuildRequires: ghc-rpm-macros >= 0.7.3 -BuildRequires: hscolour -%{?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}} +ExclusiveArch: %{ghc_arches} +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} +# END cabal2spec +BuildRequires: ghc-network-prof +BuildRequires: ghc-parsec-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-MonadCatchIO-mtl-prof +BuildRequires: ghc-xhtml-prof %description @@ -51,10 +45,20 @@ -# define the devel and prof subpkgs, devel post[un] scripts, and filelists: -# ghc-%pkg_name{,devel,prof}.files -%ghc_lib_package +# devel subpackage +%ghc_devel_package + +%ghc_devel_description + + +%ghc_devel_post_postun + + +%ghc_files LICENSE %changelog +* Fri May 25 2012 Anders Kaseorg - 3001.1.8.2-0 +- regenerated packaging with cabal2spec-0.25.5 + * Mon May 2 2011 Alexander Chernyakhovsky - 3001.1.8.2-0 - regenerated packaging with cabal2spec-0.22.5 Index: branches/fc17-dev/server/fedora/specs/ghc-unix-handle.spec =================================================================== --- branches/fc17-dev/server/fedora/specs/ghc-unix-handle.spec (revision 2210) +++ branches/fc17-dev/server/fedora/specs/ghc-unix-handle.spec (revision 2211) @@ -1,19 +1,11 @@ -# For Haskell Packaging Guidelines see: -# - https://fedoraproject.org/wiki/Packaging:Haskell -# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell +# cabal2spec-0.25 +# 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) -#%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel - -# foreign library dependencies (used for buildrequires and devel subpkg requires) -#%%global ghc_pkg_c_deps @CDEP1@-devel Name: ghc-%{pkg_name} @@ -24,14 +16,11 @@ Group: System Environment/Libraries License: BSD +# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 -BuildRequires: ghc, ghc-doc, ghc-prof -# macros for building haskell packages -BuildRequires: ghc-rpm-macros >= 0.7.3 -BuildRequires: hscolour -%{?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}} +ExclusiveArch: %{ghc_arches} +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} +# END cabal2spec %description @@ -51,10 +40,20 @@ -# define the devel and prof subpkgs, devel post[un] scripts, and filelists: -# ghc-%pkg_name{,devel,prof}.files -%ghc_lib_package +# devel subpackage +%ghc_devel_package + +%ghc_devel_description + + +%ghc_devel_post_postun + + +%ghc_files LICENSE %changelog +* Fri May 25 2012 Anders Kaseorg - 0.0.0-0 +- regenerated packaging with cabal2spec-0.25.5 + * Mon May 2 2011 Alexander Chernyakhovsky - 0.0.0-0 - regenerated packaging with cabal2spec-0.22.5