[git-annex/el6] revert to F17 package for ghc-7.0.4

Jens Petersen petersen at fedoraproject.org
Mon Dec 10 09:07:25 UTC 2012 

commit 52445fd0309fc0bd430850de583d49eb68fc3603
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Dec 10 18:07:15 2012 +0900

    revert to F17 package for ghc-7.0.4

 .gitignore                |    3 +-
 git-annex-no-ifelse.patch |   61 ++++++++++++++++++++++++--------------------
 git-annex.spec            |   49 ++++++++++++++++--------------------
 sources                   |    2 +-
 4 files changed, 57 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0957ee5..884b3b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/git-annex-3.20120615.tar.gz
-/git-annex-3.20121009.tar.gz
+/joeyh-git-annex-3.20120522-134-g6895a6e.tar.gz
diff --git a/git-annex-no-ifelse.patch b/git-annex-no-ifelse.patch
index f6d285e..6db3a33 100644
--- a/git-annex-no-ifelse.patch
+++ b/git-annex-no-ifelse.patch
@@ -1,7 +1,7 @@
-diff -up git-annex-3.20121009/Common.hs.ifelse git-annex-3.20121009/Common.hs
---- git-annex-3.20121009/Common.hs.ifelse	2012-10-10 04:44:14.000000000 +0900
-+++ git-annex-3.20121009/Common.hs	2012-11-06 18:09:52.102501326 +0900
-@@ -1,7 +1,6 @@
+diff -u -r -U5 -N git-annex-3.20120522/Common.hs git-annex-3.20120522.no-ifelse/Common.hs
+--- git-annex-3.20120522/Common.hs	2012-05-22 11:28:25.000000000 -0400
++++ git-annex-3.20120522.no-ifelse/Common.hs	2012-06-02 09:44:55.941168737 -0400
+@@ -1,9 +1,8 @@
  module Common (module X) where
  
  import Control.Monad as X hiding (join)
@@ -9,15 +9,32 @@ diff -up git-annex-3.20121009/Common.hs.ifelse git-annex-3.20121009/Common.hs
  import Control.Applicative as X
  import Control.Monad.State.Strict as X (liftIO)
  import Control.Exception.Extensible as X (IOException)
-@@ -29,3 +28,5 @@ import Utility.Applicative as X
+ 
+ import Data.Maybe as X
+@@ -25,7 +24,8 @@
+ import Utility.SafeCommand as X
+ import Utility.Path as X
+ import Utility.Directory as X
+ import Utility.Monad as X
  import Utility.FileSystemEncoding as X
++import Utility.Conditional as X
  
  import Utility.PartialPrelude as X
-+
-+import Utility.Conditional as X
-diff -up git-annex-3.20121009/Utility/Conditional.hs.ifelse git-annex-3.20121009/Utility/Conditional.hs
---- git-annex-3.20121009/Utility/Conditional.hs.ifelse	2012-11-06 18:02:43.792838443 +0900
-+++ git-annex-3.20121009/Utility/Conditional.hs	2012-11-06 18:02:43.792838443 +0900
+diff -u joeyh-git-annex-6895a6e/git-annex.cabal.no-ifelse joeyh-git-annex-6895a6e/git-annex.cabal
+--- joeyh-git-annex-6895a6e/git-annex.cabal.no-ifelse	2012-06-01 12:33:41.000000000 +0900
++++ joeyh-git-annex-6895a6e/git-annex.cabal	2012-06-26 13:26:56.398051874 +0900
+@@ -35,7 +35,7 @@
+    unix, containers, utf8-string, network, mtl, bytestring, old-locale, time,
+    pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP,
+    base < 5, monad-control, transformers-base, lifted-base,
+-   IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance
++   text, QuickCheck >= 2.1, bloomfilter, edit-distance
+   Other-Modules: Utility.Touch
+   C-Sources: Utility/libdiskfree.c
+   Extensions: CPP
+diff -u -r -U5 -N git-annex-3.20120522/Utility/Conditional.hs git-annex-3.20120522.no-ifelse/Utility/Conditional.hs
+--- git-annex-3.20120522/Utility/Conditional.hs	1969-12-31 19:00:00.000000000 -0500
++++ git-annex-3.20120522.no-ifelse/Utility/Conditional.hs	2012-06-02 09:44:55.942168737 -0400
 @@ -0,0 +1,16 @@
 +{- monadic conditional operators
 + -
@@ -35,18 +52,18 @@ diff -up git-annex-3.20121009/Utility/Conditional.hs.ifelse git-annex-3.20121009
 +
 +unlessM :: Monad m => m Bool -> m () -> m ()
 +unlessM c a = c >>= flip unless a
-diff -up git-annex-3.20121009/Utility/Directory.hs.ifelse git-annex-3.20121009/Utility/Directory.hs
---- git-annex-3.20121009/Utility/Directory.hs.ifelse	2012-10-10 04:44:14.000000000 +0900
-+++ git-annex-3.20121009/Utility/Directory.hs	2012-11-06 18:11:06.849445812 +0900
+diff -up joeyh-git-annex-6895a6e/Utility/Directory.hs~ joeyh-git-annex-6895a6e/Utility/Directory.hs
+--- joeyh-git-annex-6895a6e/Utility/Directory.hs~	2012-06-01 12:33:41.000000000 +0900
++++ joeyh-git-annex-6895a6e/Utility/Directory.hs	2012-06-26 13:17:05.177416437 +0900
 @@ -12,7 +12,6 @@ import System.Posix.Files
  import System.Directory
- import Control.Exception (throw, bracket_)
+ import Control.Exception (throw)
  import Control.Monad
 -import Control.Monad.IfElse
  import System.FilePath
  import Control.Applicative
- import System.Posix.Directory
-@@ -23,6 +22,7 @@ import Utility.TempFile
+ import Control.Exception (bracket_)
+@@ -24,6 +23,7 @@ import Utility.TempFile
  import Utility.Exception
  import Utility.Monad
  import Utility.Path
@@ -54,15 +71,3 @@ diff -up git-annex-3.20121009/Utility/Directory.hs.ifelse git-annex-3.20121009/U
  
  dirCruft :: FilePath -> Bool
  dirCruft "." = True
-diff -up git-annex-3.20121009/git-annex.cabal.ifelse git-annex-3.20121009/git-annex.cabal
---- git-annex-3.20121009/git-annex.cabal.ifelse	2012-11-06 18:02:43.789838444 +0900
-+++ git-annex-3.20121009/git-annex.cabal	2012-11-06 18:03:13.847815011 +0900
-@@ -55,7 +55,7 @@ Executable git-annex
-    unix, containers, utf8-string, network, mtl, bytestring, old-locale, time,
-    pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP,
-    base == 4.5.*, monad-control, transformers-base, lifted-base,
--   IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process
-+   text, QuickCheck >= 2.1, bloomfilter, edit-distance, process
-   -- Need to list these because they're generated from .hsc files.
-   Other-Modules: Utility.Touch Utility.Mounts
-   Include-Dirs: Utility
diff --git a/git-annex.spec b/git-annex.spec
index 3f6ad1b..df7bd25 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -1,26 +1,27 @@
+# cabal2spec-0.25.4
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %bcond_without docs
 
+%global git_index 6895a6e
+
 Name:           git-annex
-Version:        3.20121009
-Release:        1%{?dist}
+Version:        3.20120522
+Release:        2%{?dist}
 Summary:        Manage files with git, without checking their contents into git
 
+Group:          Applications/Archiving
 License:        GPLv3+
+# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{name}
-Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-Patch0:         git-annex-default-flags.patch
-Patch1:         git-annex-no-ifelse.patch
-
+# wget https://nodeload.github.com/joeyh/git-annex/tarball/ghc-7.0
+Source0:        joeyh-%{name}-%{version}-134-g%{git_index}.tar.gz
+Patch0:         git-annex-no-ifelse.patch
+ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
-# Begin cabal-rpm deps:
-BuildRequires:  ghc-HTTP-devel
-BuildRequires:  ghc-MissingH-devel
-BuildRequires:  ghc-QuickCheck-devel
-BuildRequires:  ghc-SHA-devel
+# END cabal2spec
 BuildRequires:  ghc-bloomfilter-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-containers-devel
@@ -29,18 +30,21 @@ BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-edit-distance-devel
 BuildRequires:  ghc-extensible-exceptions-devel
 BuildRequires:  ghc-filepath-devel
-BuildRequires:  ghc-hinotify-devel
+#BuildRequires:  ghc-hS3-devel
 BuildRequires:  ghc-hslogger-devel
+BuildRequires:  ghc-HTTP-devel
 #BuildRequires:  ghc-IfElse-devel
 BuildRequires:  ghc-json-devel
 BuildRequires:  ghc-lifted-base-devel
+BuildRequires:  ghc-MissingH-devel
 BuildRequires:  ghc-monad-control-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-network-devel
 BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-pcre-light-devel
 BuildRequires:  ghc-process-devel
-BuildRequires:  ghc-stm-devel
+BuildRequires:  ghc-QuickCheck-devel
+BuildRequires:  ghc-SHA-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-time-devel
 BuildRequires:  ghc-transformers-base-devel
@@ -85,9 +89,8 @@ This package contains the documentation for %{name} in HTML format.
 %endif
 
 %prep
-%setup -q
-%patch0 -p1 -b .flags
-%patch1 -p1 -b .ifelse
+%setup -q %{?git_index:-n joeyh-git-annex-%{git_index}}
+%patch0 -p1 -b .no-ifelse
 
 
 %build
@@ -108,7 +111,7 @@ install -m 0644 git-annex-shell.1 %{buildroot}%{_mandir}/man1
 
 
 %files
-%doc COPYRIGHT README debian/changelog
+%doc doc/GPL README debian/changelog
 %attr(755,root,root) %{_bindir}/%{name}
 %{_bindir}/%{name}-shell
 %{_mandir}/man1/git-annex.1*
@@ -121,20 +124,12 @@ install -m 0644 git-annex-shell.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
-* Tue Nov 06 2012 Jens Petersen <petersen at redhat.com> - 3.20121009-1
-- update to 3.20121009
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.20120615-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jun 26 2012 Jens Petersen <petersen at redhat.com> - 3.20120615-2
+* Tue Jun 26 2012 Jens Petersen <petersen at redhat.com> - 3.20120522-2
+- build ghc7.0 branch from github for ghc-7.0
 - fix doc file symlinks
 - BR ImageMagick-perl
 - make docs subpackage noarch
 
-* Sat Jun 23 2012 Ben Boeckel <mathstuf at gmail.com> - 3.20120615-1
-- Update to 3.20120615
-
 * Tue May 22 2012 Jens Petersen <petersen at redhat.com> - 3.20120522-1
 - create git-annex-shell symlink
 - build and include manpages and docs in a subpackage
diff --git a/sources b/sources
index 5ae016d..5363343 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e7616ce18cf7ec71086ab84ce566b21  git-annex-3.20121009.tar.gz
+9bf5895bcd50360afa29ee874f5e7b8a  joeyh-git-annex-3.20120522-134-g6895a6e.tar.gz

More information about the scm-commits mailing list