[ghc-show/f18] Disable mysmallcheck

Shakthi Kannan shakthimaan at fedoraproject.org
Fri May 3 11:01:14 UTC 2013


commit 77b850ac1bc3925c7a2a63c246f2e58112e92cc8
Author: Shakthi Kannan <skannan at redhat.com>
Date:   Fri May 3 16:28:50 2013 +0530

    Disable mysmallcheck

 ghc-show.spec                           |   39 +++++++++++++++++++------------
 show-0.4.1.2-disable-mysmallcheck.patch |   16 ++++++++++++
 2 files changed, 40 insertions(+), 15 deletions(-)
---
diff --git a/ghc-show.spec b/ghc-show.spec
index a8b446d..9b56858 100644
--- a/ghc-show.spec
+++ b/ghc-show.spec
@@ -1,4 +1,3 @@
-# cabal2spec-0.25
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
@@ -6,31 +5,31 @@
 
 %global common_summary Show library that provides ShowQ, ShowFun, and SimpleReflect
 
-%global common_description The library provides ShowQ, ShowFun, and \
-SimpleReflect. ShowFun gives us Typeable instances for neutering \
-IO expressions. ShowQ adds SmallCheck & QuickCheck support. SimpleReflect \
-allows us to literally see how functions 'expand'.
+%global common_description This library provides ShowQ, ShowFun, and SimpleReflect.\
+ShowFun gives us Typeable instances for neutering IO expressions.\
+ShowQ adds SmallCheck & QuickCheck support.\
+SimpleReflect allows us to literally see how functions 'expand'.
 
 Name:           ghc-%{pkg_name}
 Version:        0.4.1.2
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        %{common_summary}
 
-Group:          System Environment/Libraries
-License:        GPLv2
-# BEGIN cabal2spec
+# SimpleReflect is BSD and show.cabal says GPL
+License:        GPL+
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 Patch0:         show-0.4.1.2-fix-fsf-address.patch
-ExclusiveArch:  %{ghc_arches}
-BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
-# END cabal2spec
+Patch1:		show-0.4.1.2-disable-mysmallcheck.patch
 
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros
+# Begin cabal-rpm deps:
 BuildRequires:  ghc-QuickCheck-devel
 BuildRequires:  ghc-random-devel
 BuildRequires:  ghc-smallcheck-devel
 BuildRequires:  ghc-syb-devel
+# End cabal-rpm deps
 
 %description
 %{common_description}
@@ -38,7 +37,8 @@ BuildRequires:  ghc-syb-devel
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
-%patch0 -p1 -b .fix
+%patch0 -p1 -b .orig
+%patch1 -p1 -b .fix
 
 %build
 %ghc_lib_build
@@ -48,7 +48,6 @@ BuildRequires:  ghc-syb-devel
 %ghc_lib_install
 
 
-# devel subpackage
 %ghc_devel_package
 
 %ghc_devel_description
@@ -61,6 +60,16 @@ BuildRequires:  ghc-syb-devel
 
 
 %changelog
+* Fri May  3 2013 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> - 0.4.1.2-5
+- Disable mysmallcheck
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Nov 18 2012 Jens Petersen <petersen at redhat.com> - 0.4.1.2-3
+- update with cabal-rpm
+- change license tag to GPL+ since no version specified
+
 * Fri Sep 07 2012 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> - 0.4.1.2-2
 - Updated summary
 
diff --git a/show-0.4.1.2-disable-mysmallcheck.patch b/show-0.4.1.2-disable-mysmallcheck.patch
new file mode 100644
index 0000000..cca97ac
--- /dev/null
+++ b/show-0.4.1.2-disable-mysmallcheck.patch
@@ -0,0 +1,16 @@
+diff -up show-0.4.1.2/ShowQ.hs.fix show-0.4.1.2/ShowQ.hs
+--- show-0.4.1.2/ShowQ.hs.fix	2013-05-03 16:02:53.995282549 +0530
++++ show-0.4.1.2/ShowQ.hs	2013-05-03 16:03:38.330291233 +0530
+@@ -8,10 +8,12 @@ import System.IO.Unsafe (unsafePerformIO
+ import Test.QuickCheck (numTests, quickCheckWithResult, stdArgs, Result(..), Testable)
+ import qualified Test.SmallCheck as SC (smallCheck, Testable)
+ 
++{--
+ mysmallcheck :: (SC.Testable prop) => prop -> ()
+ mysmallcheck = unsafePerformIO . mysmallcheck'
+ mysmallcheck' :: (SC.Testable prop) => prop -> IO ()
+ mysmallcheck' = SC.smallCheck 6
++--}
+ 
+ myquickcheck :: Testable prop => prop -> String
+ myquickcheck = unsafePerformIO . myquickcheck'


More information about the scm-commits mailing list