Index: /branches/fc15-dev/server/fedora/Makefile =================================================================== --- /branches/fc15-dev/server/fedora/Makefile (revision 1825) +++ /branches/fc15-dev/server/fedora/Makefile (revision 1826) @@ -20,5 +20,5 @@ upstream_yum = krb5 krb5.i686 httpd openssh -hackage = MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0 +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 upstream = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr @@ -40,6 +40,6 @@ server_url = "http://web.mit.edu/scripts/src" server_arch = "fedora.stable" -#openafs_url = "http://dl.openafs.org/dl/openafs/1.4.12/openafs-1.4.12-1.1.2.src.rpm" -openafs_url = "http://web.mit.edu/~scripts/rpm-fc13/openafs-1.4.12.1-1.0.pre3.src.rpm" +openafs_url = "http://dl.openafs.org/dl/openafs/1.4.14/openafs-1.4.14-1.1.1.src.rpm" +#openafs_url = "http://web.mit.edu/~scripts/rpm-fc13/openafs-1.4.12.1-1.0.pre3.src.rpm" zephyr_url = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.1.tar.gz" Index: /branches/fc15-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec =================================================================== --- /branches/fc15-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec (revision 1825) +++ /branches/fc15-dev/server/fedora/specs/ghc-MonadCatchIO-mtl.spec (revision 1826) @@ -26,5 +26,5 @@ Name: ghc-%{pkg_name} -Version: 0.3.0.1 +Version: 0.3.0.2 Release: 1.%{scriptsversion}%{?dist} Summary: %{common_summary} @@ -65,5 +65,5 @@ %changelog -* Sat Apr 16 2011 Alexander Chernyakhovsky - 0.3.0.1-1 +* Sat Apr 16 2011 Alexander Chernyakhovsky - 0.3.0.2-1 - regenerated packaging for Fedora automatically generated by cabal2spec-0.22.5 Index: /branches/fc15-dev/server/fedora/specs/ghc-cgi.spec =================================================================== --- /branches/fc15-dev/server/fedora/specs/ghc-cgi.spec (revision 1825) +++ /branches/fc15-dev/server/fedora/specs/ghc-cgi.spec (revision 1826) @@ -1,6 +1,12 @@ +# 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. @@ -8,5 +14,8 @@ %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: +# 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 @@ -17,17 +26,18 @@ Name: ghc-%{pkg_name} -Version: 3001.1.8.1 +Version: 3001.1.8.2 Release: 0.%{scriptsversion}%{?dist} Summary: %{common_summary} Group: System Environment/Libraries -License: BSD -URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +License: @LICENSE@ +URL: http://hackage.haskell.org/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 +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.0 +# 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}} @@ -35,10 +45,4 @@ %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif - - -%{?ghc_lib_package} @@ -52,13 +56,16 @@ %install -rm -rf $RPM_BUILD_ROOT %ghc_lib_install -%clean -rm -rf $RPM_BUILD_ROOT +# define the devel and prof subpkgs, devel post[un] scripts, and filelists: +# ghc-%pkg_name{,devel,prof}.files +%ghc_lib_package %changelog +* Sat Apr 16 2011 Alexander Chernyakhovsky - 3001.1.8.2-0 +- regenerated packaging for Fedora automatically generated by 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 1825) +++ /branches/fc15-dev/server/fedora/specs/ghc-unix-handle.spec (revision 1826) @@ -1,18 +1,19 @@ +# 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. -# add any Haskell library dependencies here: +# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) #%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel -# add any foreign library dependencies here: +# foreign library dependencies (used for buildrequires and devel subpkg requires) #%%global ghc_pkg_c_deps @CDEP1@-devel - -%bcond_without shared - -# debuginfo is not useful for ghc -%global debug_package %{nil} Name: ghc-%{pkg_name} @@ -22,12 +23,13 @@ Group: System Environment/Libraries -License: BSD -URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +License: @LICENSE@ +URL: http://hackage.haskell.org/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 +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.0 +# 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}} @@ -35,10 +37,4 @@ %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif - - -%{?ghc_lib_package} @@ -52,13 +48,16 @@ %install -rm -rf $RPM_BUILD_ROOT %ghc_lib_install -%clean -rm -rf $RPM_BUILD_ROOT +# define the devel and prof subpkgs, devel post[un] scripts, and filelists: +# ghc-%pkg_name{,devel,prof}.files +%ghc_lib_package %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