Changeset 2211 for branches/fc17-dev/server/fedora

Timestamp:

May 25, 2012, 4:09:12 AM (12 years ago)

Author:

andersk

Message:

Update ghc-cgi, ghc-unix-handle; punt ghc-MonadCatchIO-mtl

Location:

branches/fc17-dev/server/fedora

Files:

• Makefile (modified) (1 diff)
• specs/ghc-MonadCatchIO-mtl.spec (deleted)
• specs/ghc-cgi.spec (modified) (3 diffs)
• specs/ghc-unix-handle.spec (modified) (3 diffs)

branches/fc17-dev/server/fedora/Makefile

@@ -20 +20 @@
 
 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

branches/fc17-dev/server/fedora/specs/ghc-cgi.spec

@@ -1 @@
-# 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 +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 +45 @@
 
 
-# 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 <andersk@mit.edu> - 3001.1.8.2-0
+- regenerated packaging with cabal2spec-0.25.5
+
 * Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 3001.1.8.2-0
 - regenerated packaging with cabal2spec-0.22.5

branches/fc17-dev/server/fedora/specs/ghc-unix-handle.spec

@@ -1 @@
-# 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 +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
 
 %description
@@ -51 +40 @@
 
 
-# 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 <andersk@mit.edu> - 0.0.0-0
+- regenerated packaging with cabal2spec-0.25.5
+
 * Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0.0-0
 - regenerated packaging with cabal2spec-0.22.5