From 2f874757d187cab9c701cf23749a27ce3976e779 Mon Sep 17 00:00:00 2001 From: Shakthi Kannan Date: Aug 13 2012 12:31:24 +0000 Subject: Updated to 1.2 --- diff --git a/.gitignore b/.gitignore index 0cb5854..4eec532 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ chalmers-lava2000-1.1.1.tar.gz /chalmers-lava2000-1.1.2.tar.gz +/chalmers-lava2000-1.2.0.tar.gz diff --git a/chalmers-lava2000-1.1.2-ghc74-haskell98.patch b/chalmers-lava2000-1.1.2-ghc74-haskell98.patch deleted file mode 100644 index bc076c7..0000000 --- a/chalmers-lava2000-1.1.2-ghc74-haskell98.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff -up chalmers-lava2000-1.1.2/chalmers-lava2000.cabal~ chalmers-lava2000-1.1.2/chalmers-lava2000.cabal ---- chalmers-lava2000-1.1.2/chalmers-lava2000.cabal~ 2012-04-11 13:39:14.603999998 +0900 -+++ chalmers-lava2000-1.1.2/chalmers-lava2000.cabal 2012-04-11 18:54:08.303002437 +0900 -@@ -44,7 +44,7 @@ library - other-modules: - Paths_chalmers_lava2000 - -- build-Depends: base >= 3 && < 5, haskell98 >= 1 && < 2, process >= 1 && < 2 -+ build-Depends: base >= 3 && < 5, process >= 1 && < 2, random - - extensions: Rank2Types, ExistentialQuantification - ghc-options: -fno-warn-overlapping-patterns -fno-warn-missing-methods -diff -up chalmers-lava2000-1.1.2/Lava/ConstructiveAnalysis.hs~ chalmers-lava2000-1.1.2/Lava/ConstructiveAnalysis.hs ---- chalmers-lava2000-1.1.2/Lava/ConstructiveAnalysis.hs~ 2011-04-27 01:24:01.000000000 +0900 -+++ chalmers-lava2000-1.1.2/Lava/ConstructiveAnalysis.hs 2012-04-11 18:50:53.700001635 +0900 -@@ -17,7 +17,7 @@ import Lava.MyST - , unsafeInterleaveST - ) - --import List -+import Data.List - ( isPrefixOf - ) - -diff -up chalmers-lava2000-1.1.2/Lava/Generic.hs~ chalmers-lava2000-1.1.2/Lava/Generic.hs ---- chalmers-lava2000-1.1.2/Lava/Generic.hs~ 2011-04-27 01:24:01.000000000 +0900 -+++ chalmers-lava2000-1.1.2/Lava/Generic.hs 2012-04-11 18:51:04.672997527 +0900 -@@ -10,7 +10,7 @@ import Lava.LavaRandom - , next - ) - --import List -+import Data.List - ( transpose - ) - -diff -up chalmers-lava2000-1.1.2/Lava/IOBuffering.hs~ chalmers-lava2000-1.1.2/Lava/IOBuffering.hs ---- chalmers-lava2000-1.1.2/Lava/IOBuffering.hs~ 2011-04-27 01:24:01.000000000 +0900 -+++ chalmers-lava2000-1.1.2/Lava/IOBuffering.hs 2012-04-11 18:51:22.730992301 +0900 -@@ -1,6 +1,6 @@ - module Lava.IOBuffering where - --import IO -+import System.IO - ( hSetBuffering - , stdout - , BufferMode(..) -diff -up chalmers-lava2000-1.1.2/Lava/LavaRandom.hs~ chalmers-lava2000-1.1.2/Lava/LavaRandom.hs ---- chalmers-lava2000-1.1.2/Lava/LavaRandom.hs~ 2011-04-27 01:24:01.000000000 +0900 -+++ chalmers-lava2000-1.1.2/Lava/LavaRandom.hs 2012-04-11 18:52:13.376998109 +0900 -@@ -6,7 +6,7 @@ module Lava.LavaRandom - ) - where - --import Random -+import System.Random - ( StdGen - , newStdGen - , next -diff -up chalmers-lava2000-1.1.2/Lava/Property.hs~ chalmers-lava2000-1.1.2/Lava/Property.hs ---- chalmers-lava2000-1.1.2/Lava/Property.hs~ 2011-04-27 01:24:01.000000000 +0900 -+++ chalmers-lava2000-1.1.2/Lava/Property.hs 2012-04-11 18:54:58.471998733 +0900 -@@ -22,14 +22,14 @@ module Lava.Property - import Lava.Signal - import Lava.Generic - --import Monad -+import Control.Monad - ( liftM2 - , liftM3 - , liftM4 - , liftM5 - ) - --import List -+import Data.List - ( intersperse - , transpose - ) -diff -up chalmers-lava2000-1.1.2/Lava/Retime.hs~ chalmers-lava2000-1.1.2/Lava/Retime.hs ---- chalmers-lava2000-1.1.2/Lava/Retime.hs~ 2011-04-27 01:24:01.000000000 +0900 -+++ chalmers-lava2000-1.1.2/Lava/Retime.hs 2012-04-11 18:55:06.137000618 +0900 -@@ -8,7 +8,7 @@ import Lava.Generic - import Lava.Sequent - import Lava.Netlist - --import List -+import Data.List - ( isPrefixOf - ) - -diff -up chalmers-lava2000-1.1.2/Lava/Signal.hs~ chalmers-lava2000-1.1.2/Lava/Signal.hs ---- chalmers-lava2000-1.1.2/Lava/Signal.hs~ 2011-04-27 01:24:01.000000000 +0900 -+++ chalmers-lava2000-1.1.2/Lava/Signal.hs 2012-04-11 18:55:13.610001764 +0900 -@@ -4,7 +4,7 @@ import Lava.Ref - import Lava.Sequent - import Lava.Error - --import List -+import Data.List - ( transpose - ) - -diff -up chalmers-lava2000-1.1.2/Lava/Stable.hs~ chalmers-lava2000-1.1.2/Lava/Stable.hs ---- chalmers-lava2000-1.1.2/Lava/Stable.hs~ 2011-04-27 01:24:01.000000000 +0900 -+++ chalmers-lava2000-1.1.2/Lava/Stable.hs 2012-04-11 18:55:20.769998196 +0900 -@@ -15,7 +15,7 @@ import Lava.MyST - , unsafeInterleaveST - ) - --import List -+import Data.List - ( isPrefixOf - ) - -diff -up chalmers-lava2000-1.1.2/Lava/Vhdl.hs~ chalmers-lava2000-1.1.2/Lava/Vhdl.hs ---- chalmers-lava2000-1.1.2/Lava/Vhdl.hs~ 2011-04-27 01:24:01.000000000 +0900 -+++ chalmers-lava2000-1.1.2/Lava/Vhdl.hs 2012-04-11 18:55:42.609997947 +0900 -@@ -12,12 +12,12 @@ import Lava.Sequent - import Lava.Error - import Lava.LavaDir - --import List -+import Data.List - ( intersperse - , nub - ) - --import IO -+import System.IO - ( openFile - , IOMode(..) - , hPutStr diff --git a/ghc-chalmers-lava2000-1.2-remove-verification-modules.patch b/ghc-chalmers-lava2000-1.2-remove-verification-modules.patch new file mode 100644 index 0000000..d349d31 --- /dev/null +++ b/ghc-chalmers-lava2000-1.2-remove-verification-modules.patch @@ -0,0 +1,84 @@ +diff -up chalmers-lava2000-1.2.0/chalmers-lava2000.cabal.fix chalmers-lava2000-1.2.0/chalmers-lava2000.cabal +--- chalmers-lava2000-1.2.0/chalmers-lava2000.cabal.fix 2012-08-13 17:14:12.701053750 +0530 ++++ chalmers-lava2000-1.2.0/chalmers-lava2000.cabal 2012-08-13 17:15:41.203050365 +0530 +@@ -11,7 +11,7 @@ maintainer: Emil Axelsson = 1.6 + build-type: Simple +-data-files: README, INSTALL, Doc/tutorial.ps, Vhdl/lava.vhd, Scripts/satzoo.wrapper, Scripts/smv.wrapper ++data-files: INSTALL, Doc/tutorial.ps, Vhdl/lava.vhd + + source-repository head + type: darcs +@@ -21,20 +21,13 @@ library + exposed-modules: + Lava + Lava.Arithmetic +- Lava.Captain + Lava.Combinational + Lava.ConstructiveAnalysis +- Lava.Eprover + Lava.Error +- Lava.Fixit + Lava.Generic +- Lava.HeerHugo + Lava.IOBuffering +- Lava.Isc + Lava.LavaDir + Lava.LavaRandom +- Lava.Limmat +- Lava.Modoc + Lava.MyST + Lava.Netlist + Lava.Operators +@@ -42,22 +35,17 @@ library + Lava.Property + Lava.Ref + Lava.Retime +- Lava.Satnik +- Lava.Satzoo + Lava.Sequent + Lava.Sequential + Lava.SequentialCircuits + Lava.SequentialConstructive + Lava.Signal + Lava.SignalTry +- Lava.Smv + Lava.Stable + Lava.Table + Lava.Test +- Lava.Verification + Lava.Vhdl +- Lava.Vis +- Lava.Zchaff ++ + + other-modules: + Paths_chalmers_lava2000 +diff -up chalmers-lava2000-1.2.0/Lava.hs.fix chalmers-lava2000-1.2.0/Lava.hs +--- chalmers-lava2000-1.2.0/Lava.hs.fix 2012-08-13 17:15:56.692050417 +0530 ++++ chalmers-lava2000-1.2.0/Lava.hs 2012-08-13 17:16:21.155050692 +0530 +@@ -7,11 +7,6 @@ module Lava + , module Lava.SequentialConstructive + , module Lava.ConstructiveAnalysis + , module Lava.Test +- , module Lava.Verification +- , module Lava.Vis +- , module Lava.Fixit +- , module Lava.Smv +- , module Lava.Satzoo + , module Lava.Property + , module Lava.Retime + , module Lava.Vhdl +@@ -26,11 +21,6 @@ import Lava.Sequential + import Lava.SequentialConstructive + import Lava.ConstructiveAnalysis + import Lava.Test +-import Lava.Verification +-import Lava.Vis +-import Lava.Fixit +-import Lava.Smv +-import Lava.Satzoo + import Lava.Property + import Lava.Retime + import Lava.Vhdl diff --git a/ghc-chalmers-lava2000-remove-verification-modules.patch b/ghc-chalmers-lava2000-remove-verification-modules.patch deleted file mode 100644 index 24be4ba..0000000 --- a/ghc-chalmers-lava2000-remove-verification-modules.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -up chalmers-lava2000-1.1.1/chalmers-lava2000.cabal.fix chalmers-lava2000-1.1.1/chalmers-lava2000.cabal ---- chalmers-lava2000-1.1.1/chalmers-lava2000.cabal.fix 2009-12-20 16:53:51.800160345 +0530 -+++ chalmers-lava2000-1.1.1/chalmers-lava2000.cabal 2009-12-20 16:55:54.581901235 +0530 -@@ -11,26 +11,19 @@ author: Koen Claessen - cabal-version: >= 1.2 - build-type: Simple --data-files: README, INSTALL, Doc/tutorial.ps, Vhdl/lava.vhd, Scripts/satzoo.wrapper, Scripts/smv.wrapper -+data-files: INSTALL, Doc/tutorial.ps, Vhdl/lava.vhd - - library - exposed-modules: - Lava - Lava.Arithmetic -- Lava.Captain - Lava.Combinational - Lava.ConstructiveAnalysis -- Lava.Eprover - Lava.Error -- Lava.Fixit - Lava.Generic -- Lava.HeerHugo - Lava.IOBuffering -- Lava.Isc - Lava.LavaDir - Lava.LavaRandom -- Lava.Limmat -- Lava.Modoc - Lava.MyST - Lava.Netlist - Lava.Operators -@@ -38,22 +31,16 @@ library - Lava.Property - Lava.Ref - Lava.Retime -- Lava.Satnik -- Lava.Satzoo - Lava.Sequent - Lava.Sequential - Lava.SequentialCircuits - Lava.SequentialConstructive - Lava.Signal - Lava.SignalTry -- Lava.Smv - Lava.Stable - Lava.Table - Lava.Test -- Lava.Verification - Lava.Vhdl -- Lava.Vis -- Lava.Zchaff - - other-modules: - Paths_chalmers_lava2000 -diff -up chalmers-lava2000-1.1.1/Lava.hs.fix chalmers-lava2000-1.1.1/Lava.hs ---- chalmers-lava2000-1.1.1/Lava.hs.fix 2009-12-20 16:56:43.629901711 +0530 -+++ chalmers-lava2000-1.1.1/Lava.hs 2009-12-20 16:58:01.773901399 +0530 -@@ -7,11 +7,6 @@ module Lava - , module Lava.SequentialConstructive - , module Lava.ConstructiveAnalysis - , module Lava.Test -- , module Lava.Verification -- , module Lava.Vis -- , module Lava.Fixit -- , module Lava.Smv -- , module Lava.Satzoo - , module Lava.Property - , module Lava.Retime - , module Lava.Vhdl -@@ -26,11 +21,6 @@ import Lava.Sequential - import Lava.SequentialConstructive - import Lava.ConstructiveAnalysis - import Lava.Test --import Lava.Verification --import Lava.Vis --import Lava.Fixit --import Lava.Smv --import Lava.Satzoo - import Lava.Property - import Lava.Retime - import Lava.Vhdl diff --git a/ghc-chalmers-lava2000.spec b/ghc-chalmers-lava2000.spec index 9f6d910..b9314bf 100644 --- a/ghc-chalmers-lava2000.spec +++ b/ghc-chalmers-lava2000.spec @@ -4,13 +4,13 @@ %global pkg_name chalmers-lava2000 -%global common_summary Haskell hardware description library +%global common_summary Haskell %{pkg_name} library -%global common_description A Hardware description library for Haskell. +%global common_description A %{pkg_name} library for Haskell. Name: ghc-%{pkg_name} -Version: 1.1.2 -Release: 5%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -18,14 +18,17 @@ License: BSD # BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +Source1: README.fedora +Patch0: ghc-chalmers-lava2000-1.2-remove-verification-modules.patch + ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec -Source1: README.fedora + +BuildRequires: ghc-array-devel +BuildRequires: ghc-process-devel BuildRequires: ghc-random-devel -Patch0: ghc-chalmers-lava2000-remove-verification-modules.patch -Patch1: chalmers-lava2000-1.1.2-ghc74-haskell98.patch %description %{common_description} @@ -34,7 +37,6 @@ Patch1: chalmers-lava2000-1.1.2-ghc74-haskell98.patch %prep %setup -q -n %{pkg_name}-%{version} %patch0 -p1 -b .orig -%patch1 -p1 -b .haskell98 %{__install} -pm 644 %{SOURCE1} . @@ -45,6 +47,7 @@ Patch1: chalmers-lava2000-1.1.2-ghc74-haskell98.patch %install %ghc_lib_install + # cleanup extra data files echo "%{_datadir}/%{pkg_name}-%{version}" >> %{name}-devel.files %{__mv} %{buildroot}%{_datadir}/%{pkg_name}-%{version}/Doc/tutorial.ps . @@ -52,6 +55,7 @@ echo "%{_datadir}/%{pkg_name}-%{version}" >> %{name}-devel.files echo "%doc tutorial.ps.gz" >> %{name}-doc.files %{__rm} -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{Doc,INSTALL} + # devel subpackage %ghc_devel_package @@ -65,19 +69,9 @@ echo "%doc tutorial.ps.gz" >> %{name}-doc.files %changelog -* Thu Jul 19 2012 Fedora Release Engineering - 1.1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Apr 11 2012 Jens Petersen - 1.1.2-4 -- fix up haskell98 build issues for ghc74 -- now depends no random instead of haskell98 - -* Sat Mar 24 2012 Jens Petersen - 1.1.2-3 -- update to cabal2spec-0.25 -- bump haskell98 upperbound for ghc-7.4 - -* Fri Jan 13 2012 Fedora Release Engineering - 1.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild +* Mon Aug 13 2012 Shakthi Kannan - 1.2.0-1 +- spec file template generated by cabal2spec-0.25.5 +- Updated to 1.2.0 * Thu Dec 29 2011 Shakthi Kannan - 1.1.2-1 - Updated to use cabal2spec-0.24.1. @@ -142,4 +136,3 @@ echo "%doc tutorial.ps.gz" >> %{name}-doc.files * Thu Dec 10 2009 Shakthi Kannan - 1.0.2-1 - Set LAVADIR path with sed. - Initial packaging for Fedora automatically generated by cabal2spec for 1.0.2 - diff --git a/sources b/sources index 015616a..36fbdf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fbbeac9b5245572a3eddf70a7e98fc91 chalmers-lava2000-1.1.2.tar.gz +f47f537528af2a9eeafc28cee1f1a067 chalmers-lava2000-1.2.0.tar.gz