Hello community, here is the log from the commit of package ghc-cgi for openSUSE:Factory checked in at 2013-08-06 06:48:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-cgi (Old) and /work/SRC/openSUSE:Factory/.ghc-cgi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-cgi" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-cgi/ghc-cgi.changes 2013-01-08 16:24:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-cgi.new/ghc-cgi.changes 2013-08-06 06:48:53.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 7 12:15:24 UTC 2013 - peter.tromm...@ohm-hochschule.de + +- update to 3001.1.7.5 from upstream +* support build w/o extensible exceptions +- update for Haskell Platfrom 2013.2 +- more transparent packaging (fewer macros) + +------------------------------------------------------------------- Old: ---- cgi-3001.1.7.4.tar.gz New: ---- cgi-3001.1.7.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-cgi.spec ++++++ --- /var/tmp/diff_new_pack.B6BKDa/_old 2013-08-06 06:48:54.000000000 +0200 +++ /var/tmp/diff_new_pack.B6BKDa/_new 2013-08-06 06:48:54.000000000 +0200 @@ -1,6 +1,7 @@ # # spec file for package ghc-cgi # +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 Herbert Graeber <herb...@graeber-clan.de> # # All modifications and additions to the file contributed by third parties @@ -15,6 +16,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global pkg_name cgi %global common_summary Haskell library for writing CGI programs @@ -22,56 +24,65 @@ %global common_description This is a Haskell library for writing CGI programs. Name: ghc-cgi -Version: 3001.1.7.4 -Release: 1 +Version: 3001.1.7.5 +Release: 0 Summary: %{common_summary} - -Group: System/Libraries License: BSD-3-Clause +Group: System/Libraries + BuildRoot: %{_tmppath}/%{name}-%{version}-build # BEGIN cabal2spec -URL: http://hackage.haskell.org/package/%{pkg_name} +Url: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz ExclusiveArch: %{ix86} x86_64 %{ghc_arches} +BuildRequires: %{!?without_hscolour:hscolour} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel -BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel BuildRequires: ghc-old-locale-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-parsec-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-xhtml-devel # END cabal2spec %description %{common_description} +%package devel +Summary: Haskell %{pkg_name} library development files +Group: Development/Languages/Other +Requires: ghc-compiler +Requires(post): ghc-compiler +Requires(postun): ghc-compiler +Requires: %{name} = %{version}-%{release} + +%description devel +%{common_description} +This package contains the development files. %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install +%post devel +%ghc_pkg_recache -# devel subpackage -%ghc_devel_package - -%ghc_devel_description - - -%ghc_devel_post_postun - +%postun devel +%ghc_pkg_recache -%ghc_files LICENSE +%files -f %{name}.files +%defattr(-,root,root,-) +%doc LICENSE +%files devel -f %{name}-devel.files +%defattr(-,root,root,-) %changelog ++++++ cgi-3001.1.7.4.tar.gz -> cgi-3001.1.7.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cgi-3001.1.7.4/Network/CGI/Compat.hs new/cgi-3001.1.7.5/Network/CGI/Compat.hs --- old/cgi-3001.1.7.4/Network/CGI/Compat.hs 2010-11-03 05:36:21.000000000 +0100 +++ new/cgi-3001.1.7.5/Network/CGI/Compat.hs 2013-05-03 08:43:32.000000000 +0200 @@ -20,7 +20,12 @@ ) where import Control.Concurrent (forkIO) -import Control.Exception.Extensible as Exception (SomeException,throw,catch,finally) +#if MIN_VERSION_base(4,0,0) +import Control.Exception +#else +import Control.Exception.Extensible +#endif + as Exception (SomeException, throw, catch, finally) import Control.Monad (unless) import Control.Monad.Trans (MonadIO, liftIO) import qualified Data.Map as Map @@ -89,7 +94,7 @@ (\ e -> abort "Cannot connect to CGI daemon." e) BS.hPut h str >> hPutStrLn h "" (sendBack h `finally` hClose h) - `Prelude.catch` (\e -> unless (isEOFError e) (ioError e)) + `Exception.catch` (\e -> unless (isEOFError e) (ioError e)) -- | Returns the query string, or the request body if it is -- a POST request, or the empty string if there is an error. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cgi-3001.1.7.4/Network/CGI/Monad.hs new/cgi-3001.1.7.5/Network/CGI/Monad.hs --- old/cgi-3001.1.7.4/Network/CGI/Monad.hs 2010-11-03 05:36:21.000000000 +0100 +++ new/cgi-3001.1.7.5/Network/CGI/Monad.hs 2013-05-03 08:43:32.000000000 +0200 @@ -27,7 +27,12 @@ throwCGI, catchCGI, tryCGI, handleExceptionCGI, ) where -import Control.Exception.Extensible as Exception (SomeException, try, throwIO) +#if MIN_VERSION_base(4,0,0) +import Control.Exception +#else +import Control.Exception.Extensible +#endif + as Exception (SomeException, try, throwIO) import Control.Monad (liftM) import Control.Monad.Error (MonadError(..)) import Control.Monad.Reader (ReaderT(..), asks) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cgi-3001.1.7.4/Network/CGI.hs new/cgi-3001.1.7.5/Network/CGI.hs --- old/cgi-3001.1.7.4/Network/CGI.hs 2010-11-03 05:36:21.000000000 +0100 +++ new/cgi-3001.1.7.5/Network/CGI.hs 2013-05-03 08:43:32.000000000 +0200 @@ -94,7 +94,12 @@ , module Network.CGI.Compat ) where -import Control.Exception.Extensible (Exception(..), SomeException, ErrorCall(..)) +#if MIN_VERSION_base(4,0,0) +import Control.Exception +#else +import Control.Exception.Extensible +#endif + (Exception(..), SomeException, ErrorCall(..)) import Control.Monad (liftM) import Control.Monad.Trans (MonadIO, liftIO) import Data.Char (toUpper) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cgi-3001.1.7.4/cgi.cabal new/cgi-3001.1.7.5/cgi.cabal --- old/cgi-3001.1.7.4/cgi.cabal 2010-11-03 05:36:21.000000000 +0100 +++ new/cgi-3001.1.7.5/cgi.cabal 2013-05-03 08:43:32.000000000 +0200 @@ -1,5 +1,5 @@ Name: cgi -Version: 3001.1.7.4 +Version: 3001.1.7.5 Copyright: Bjorn Bringert, Andy Gill, Anders Kaseorg, Ian Lynagh, Erik Meijer, Sven Panne, Jeremy Shaw Category: Network @@ -16,6 +16,7 @@ Flag split-base Flag bytestring-in-base +Flag extensible-exceptions-in-base Library Exposed-Modules: @@ -28,15 +29,16 @@ Network.CGI.Accept, Network.CGI.Multipart, Network.CGI.Header - Extensions: MultiParamTypeClasses + Extensions: + CPP, + MultiParamTypeClasses ghc-options: -Wall Build-depends: network >= 2.0, parsec >= 2.0, mtl >= 1.0, - xhtml >= 3000.0.0, - extensible-exceptions + xhtml >= 3000.0.0 If flag(split-base) Build-depends: base >= 3 && < 5, old-time, old-locale, containers Else @@ -45,6 +47,10 @@ Build-depends: base >= 2 && < 3 Else Build-depends: base < 2 || < 5, bytestring + If flag(extensible-exceptions-in-base) + Build-depends: base >= 4 + Else + Build-depends: base < 4, extensible-exceptions --Executable: printinput --Main-Is: printinput.hs -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
