From 06e2c58fc08d99f1e810752fdc913cfe84c0411a Mon Sep 17 00:00:00 2001 From: Shakthi Kannan Date: Aug 13 2012 12:31:56 +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/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 7c7ac33..b9314bf 100644 --- a/ghc-chalmers-lava2000.spec +++ b/ghc-chalmers-lava2000.spec @@ -1,17 +1,15 @@ -# For Haskell Packaging Guidelines see: -# - https://fedoraproject.org/wiki/Packaging:Haskell -# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell +# cabal2spec-0.25 +# https://fedoraproject.org/wiki/Packaging:Haskell +# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name chalmers-lava2000 -# common part of summary for all the subpackages %global common_summary Haskell %{pkg_name} library -# main description used for all the subpackages %global common_description A %{pkg_name} library for Haskell. Name: ghc-%{pkg_name} -Version: 1.1.2 +Version: 1.2.0 Release: 1%{?dist} Summary: %{common_summary} @@ -21,41 +19,21 @@ License: BSD 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-remove-verification-modules.patch +Patch0: ghc-chalmers-lava2000-1.2-remove-verification-modules.patch ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros -%if %{undefined without_hscolour} -BuildRequires: hscolour -%endif +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec -# BR any C devel dependency here -# list ghc-*-prof dependencies: -BuildRequires: ghc +BuildRequires: ghc-array-devel +BuildRequires: ghc-process-devel +BuildRequires: ghc-random-devel %description %{common_description} -%package -n ghc-%{pkg_name}-devel -Summary: Development files for %{common_summary} -Group: Development/Libraries -# BEGIN cabal2spec -%{?ghc_devel_requires} -Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} -Provides: ghc-%{pkg_name}-prof = %{version}-%{release} -# END cabal2spec -# remember to require any C devel dependency here -# Haskell devel dependencies are autogenerated by ghc-deps.sh - -%description -n ghc-%{pkg_name}-devel -%{common_description} - -This package contains the development files. - - %prep %setup -q -n %{pkg_name}-%{version} %patch0 -p1 -b .orig @@ -63,7 +41,6 @@ This package contains the development files. %build -# define cabal_configure_options -f "opt1 -opt2 ..." %ghc_lib_build @@ -79,23 +56,23 @@ echo "%doc tutorial.ps.gz" >> %{name}-doc.files %{__rm} -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{Doc,INSTALL} -%post -n ghc-%{pkg_name}-devel -%ghc_pkg_recache - +# devel subpackage +%ghc_devel_package -%postun -n ghc-%{pkg_name}-devel -%ghc_pkg_recache +%ghc_devel_description -%if %{undefined ghc_without_shared} -%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files -%endif +%ghc_devel_post_postun -%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files +%ghc_files LICENSE %changelog +* 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. - Updated to 1.1.2. @@ -159,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