petersen pushed to cabal-install (f20). "revert back to 1.16 until we move to ghc-7.8"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 13 04:38:46 UTC 2015
From d94756451228f8efce3e1ed2c668ecafe6a58b43 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen at redhat.com>
Date: Tue, 8 Jul 2014 13:55:15 +0900
Subject: revert back to 1.16 until we move to ghc-7.8
diff --git a/.gitignore b/.gitignore
index 63ec273..e8d0cda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@ cabal-install-0.8.2.tar.gz
/cabal-install-0.13.3.tar.gz
/cabal-install-0.14.0.tar.gz
/cabal-install-1.16.0.2.tar.gz
-/cabal-install-1.18.0.4.tar.gz
diff --git a/cabal-install-quieter-selfupgrade.patch b/cabal-install-quieter-selfupgrade.patch
index cff380f..1d6bcdb 100644
--- a/cabal-install-quieter-selfupgrade.patch
+++ b/cabal-install-quieter-selfupgrade.patch
@@ -1,19 +1,21 @@
---- 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 @@
+diff -up cabal-install-1.16.0.2/Distribution/Client/Update.hs.orig cabal-install-1.16.0.2/Distribution/Client/Update.hs
+--- cabal-install-1.16.0.2/Distribution/Client/Update.hs.orig 2013-05-05 05:56:19.000000000 +0900
++++ cabal-install-1.16.0.2/Distribution/Client/Update.hs 2014-02-06 13:58:52.439678760 +0900
+@@ -29,7 +29,7 @@ import Distribution.Package
import Distribution.Version
( anyVersion, withinRange )
import Distribution.Simple.Utils
-- ( writeFileAtomic, warn, notice )
-+ ( writeFileAtomic, warn, notice, info )
+- ( warn, notice, writeFileAtomic )
++ ( warn, notice, info, writeFileAtomic )
import Distribution.Verbosity
( Verbosity )
-@@ -80,6 +80,6 @@
+@@ -77,7 +77,7 @@ checkForSelfUpgrade verbosity repos = do
, version `withinRange` preferredVersionRange ]
- unless (null laterPreferredVersions) $
+ when (not (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 8a80ded..45073bc 100644
--- a/cabal-install.spec
+++ b/cabal-install.spec
@@ -1,11 +1,9 @@
# https://fedoraproject.org/wiki/Packaging:Haskell
-%bcond_with tests
-
Name: cabal-install
# part of haskell-platform
-Version: 1.18.0.4
-Release: 1%{?dist}
+Version: 1.16.0.2
+Release: 35%{?dist}
Summary: Command-line interface for Cabal and Hackage
License: BSD
@@ -19,26 +17,18 @@ BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-HTTP-devel
BuildRequires: ghc-array-devel
-BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-network-devel
+BuildRequires: ghc-old-time-devel
BuildRequires: ghc-pretty-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-random-devel
-BuildRequires: ghc-stm-devel
BuildRequires: ghc-time-devel
BuildRequires: ghc-unix-devel
BuildRequires: ghc-zlib-devel
-%if %{with tests}
-BuildRequires: ghc-HUnit-devel
-BuildRequires: ghc-QuickCheck-devel
-BuildRequires: ghc-test-framework-devel
-BuildRequires: ghc-test-framework-hunit-devel
-BuildRequires: ghc-test-framework-quickcheck2-devel
-%endif
# End cabal-rpm deps
Requires: ghc-compiler
# for /etc/bash_completion.d/
@@ -71,12 +61,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-%check
-%if %{with tests}
-%cabal test
-%endif
-
-
%files
%doc LICENSE
%doc README
@@ -86,8 +70,8 @@ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
%changelog
-* Sun Jun 01 2014 Jens Petersen <petersen at redhat.com> - 1.18.0.4-1
-- update to 1.18.0.4
+* Tue Jul 8 2014 Jens Petersen <petersen at redhat.com> - 1.16.0.2-35
+- f21 rebuild
* Fri Apr 18 2014 Jens Petersen <petersen at redhat.com> - 1.16.0.2-34
- bump release over haskell-platform
diff --git a/noautobuild b/noautobuild
deleted file mode 100644
index e69de29..0000000
diff --git a/sources b/sources
index 4ad4336..0a7c678 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-665b4fc4a81eedb7dc0fa81fb07f6bdd cabal-install-1.18.0.4.tar.gz
+18e07d5b431d19d94cc5279a5e6fbfee cabal-install-1.16.0.2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/cabal-install.git/commit/?h=f20&id=d94756451228f8efce3e1ed2c668ecafe6a58b43
More information about the scm-commits
mailing list