[ghc-chalmers-lava2000/f18] Updated to 1.2

Mon Aug 13 12:39:50 UTC 2012

commit ae362dd16aee39076429996e39abd1b6121ca1a5
Author: Shakthi Kannan <shakthimaan at fedoraproject.org>
Date:   Mon Aug 13 18:02:47 2012 +0530

    Updated to 1.2

 .gitignore                                         |    1 +
 chalmers-lava2000-1.1.2-ghc74-haskell98.patch      |  133 --------------------
 ...-lava2000-1.2-remove-verification-modules.patch |   25 ++--
 ghc-chalmers-lava2000.spec                         |   37 +++----
 sources                                            |    2 +-
 5 files changed, 31 insertions(+), 167 deletions(-)
---

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/ghc-chalmers-lava2000-remove-verification-modules.patch b/ghc-chalmers-lava2000-1.2-remove-verification-modules.patch
similarity index 74%
rename from ghc-chalmers-lava2000-remove-verification-modules.patch
rename to ghc-chalmers-lava2000-1.2-remove-verification-modules.patch
index 24be4ba..d349d31 100644
--- a/ghc-chalmers-lava2000-remove-verification-modules.patch
+++ b/ghc-chalmers-lava2000-1.2-remove-verification-modules.patch
@@ -1,14 +1,16 @@
-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 <koen
- maintainer:          Emil Axelsson <emax at chalmers.se>
- cabal-version:       >= 1.2
+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 <emax
+ homepage:            http://projects.haskell.org/chalmers-lava2000/
+ cabal-version:       >= 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
  
- library
+ source-repository head
+   type:     darcs
+@@ -21,20 +21,13 @@ library
      exposed-modules:
                       Lava
                       Lava.Arithmetic
@@ -29,7 +31,7 @@ diff -up chalmers-lava2000-1.1.1/chalmers-lava2000.cabal.fix chalmers-lava2000-1
                       Lava.MyST
                       Lava.Netlist
                       Lava.Operators
-@@ -38,22 +31,16 @@ library
+@@ -42,22 +35,17 @@ library
                       Lava.Property
                       Lava.Ref
                       Lava.Retime
@@ -49,12 +51,13 @@ diff -up chalmers-lava2000-1.1.1/chalmers-lava2000.cabal.fix chalmers-lava2000-1
                       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
+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
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 <rel-eng at lists.fedoraproject.org> - 1.1.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed Apr 11 2012 Jens Petersen <petersen at redhat.com> - 1.1.2-4
-- fix up haskell98 build issues for ghc74
-- now depends no random instead of haskell98
-
-* Sat Mar 24 2012 Jens Petersen <petersen at redhat.com> - 1.1.2-3
-- update to cabal2spec-0.25
-- bump haskell98 upperbound for ghc-7.4
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Mon Aug 13 2012 Shakthi Kannan <shakthimaan at fedoraproject dot org> - 1.2.0-1
+- spec file template generated by cabal2spec-0.25.5
+- Updated to 1.2.0
 
 * Thu Dec 29 2011 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> - 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 <shakthimaan [AT] gmail dot com> - 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
