diff --git a/.gitignore b/.gitignore index 08ee958..9b72cad 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,3 @@ cabal-install-0.8.2.tar.gz /cabal-install-1.18.0.5.tar.gz /cabal-install-1.18.0.8.tar.gz /cabal-install-1.18.1.0.tar.gz -/cabal-install-1.22.6.0.tar.gz diff --git a/cabal-install-no-network-uri.patch b/cabal-install-no-network-uri.patch new file mode 100644 index 0000000..eb68f6b --- /dev/null +++ b/cabal-install-no-network-uri.patch @@ -0,0 +1,20 @@ +--- cabal-install-1.18.0.8/cabal-install.cabal~ 2015-03-25 18:13:31.448000000 +0900 ++++ cabal-install-1.18.0.8/cabal-install.cabal 2015-03-25 18:15:52.029000000 +0900 +@@ -144,7 +144,7 @@ + if flag(network-uri) + build-depends: network-uri >= 2.6, network >= 2.6 + else +- build-depends: network-uri < 2.6, network < 2.6 ++ build-depends: network < 2.6 + + if os(windows) + build-depends: Win32 >= 2 && < 3 +@@ -198,7 +198,7 @@ + if flag(network-uri) + build-depends: network-uri >= 2.6, network >= 2.6 + else +- build-depends: network-uri < 2.6, network < 2.6 ++ build-depends: network < 2.6 + + if os(windows) + build-depends: Win32 diff --git a/cabal-install-quieter-selfupgrade.patch b/cabal-install-quieter-selfupgrade.patch new file mode 100644 index 0000000..cff380f --- /dev/null +++ b/cabal-install-quieter-selfupgrade.patch @@ -0,0 +1,19 @@ +--- cabal-install-1.18.0.4/Distribution/Client/Update.hs~ 2014-05-24 15:16:45.000000000 +0900 ++++ cabal-install-1.18.0.4/Distribution/Client/Update.hs 2014-06-01 23:29:38.688667487 +0900 +@@ -31,7 +31,7 @@ + import Distribution.Version + ( anyVersion, withinRange ) + import Distribution.Simple.Utils +- ( writeFileAtomic, warn, notice ) ++ ( writeFileAtomic, warn, notice, info ) + import Distribution.Verbosity + ( Verbosity ) + +@@ -80,6 +80,6 @@ + , version `withinRange` preferredVersionRange ] + + unless (null laterPreferredVersions) $ +- notice verbosity $ ++ info verbosity $ + "Note: there is a new version of cabal-install available.\n" + ++ "To upgrade, run: cabal install cabal-install" diff --git a/cabal-install.spec b/cabal-install.spec index d759225..12e439f 100644 --- a/cabal-install.spec +++ b/cabal-install.spec @@ -7,14 +7,16 @@ Name: cabal-install # part of haskell-platform -Version: 1.22.6.0 -Release: 1%{?dist} +Version: 1.18.1.0 +Release: 2%{?dist} Summary: Command-line interface for Cabal and Hackage License: BSD -Url: https://hackage.haskell.org/package/%{name} -Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +URL: http://hackage.haskell.org/package/%{name} +Source0: http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz Source1: cabal-install.sh +Patch0: cabal-install-quieter-selfupgrade.patch +Patch1: cabal-install-no-network-uri.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -27,7 +29,6 @@ BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel -BuildRequires: ghc-network-uri-devel BuildRequires: ghc-pretty-devel BuildRequires: ghc-process-devel BuildRequires: ghc-random-devel @@ -38,8 +39,6 @@ BuildRequires: ghc-zlib-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-extensible-exceptions-devel -BuildRequires: ghc-regex-posix-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel BuildRequires: ghc-test-framework-quickcheck2-devel @@ -84,6 +83,10 @@ This provides a build with Haskell libraries statically linked. %prep %setup -q +%patch0 -p1 -b .orig +%patch1 -p1 -b .orig + +cabal-tweak-flag network-uri False %build @@ -165,8 +168,7 @@ fi %ghost %{_bindir}/%{binname} %{_bindir}/%{binname}.dynamic %else -%license LICENSE -%doc README.md +%doc LICENSE README %{_bindir}/cabal %config(noreplace) %{_sysconfdir}/bash_completion.d/cabal %config(noreplace) %{_sysconfdir}/profile.d/cabal-install.sh @@ -175,8 +177,7 @@ fi %if %{with static} %files common -%license LICENSE -%doc README.md +%doc LICENSE README %config(noreplace) %{_sysconfdir}/bash_completion.d/cabal %config(noreplace) %{_sysconfdir}/profile.d/cabal-install.sh @@ -188,9 +189,6 @@ fi %changelog -* Fri Oct 2 2015 Jens Petersen - 1.22.6.0-1 -- update to 1.22.6.0 - * Wed Jun 17 2015 Fedora Release Engineering - 1.18.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 3660273..0a3087b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0463650044697ea337705ea9e29a0221 cabal-install-1.22.6.0.tar.gz +770006873e1de2acda9c264ff5147bd8 cabal-install-1.18.1.0.tar.gz