rpms/ghc-chalmers-lava2000/F-13 ghc-chalmers-lava2000.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Shakthi Kannan]

Author: shakthimaan

Update of /cvs/pkgs/rpms/ghc-chalmers-lava2000/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29337/F-13

Modified Files:
	ghc-chalmers-lava2000.spec import.log 
Log Message:
First release.



Index: ghc-chalmers-lava2000.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-chalmers-lava2000/F-13/ghc-chalmers-lava2000.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-chalmers-lava2000.spec	30 Jun 2010 04:32:19 -0000	1.1
+++ ghc-chalmers-lava2000.spec	1 Jul 2010 04:55:22 -0000	1.2
@@ -11,7 +11,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        1.1.1
-Release:        6%{?dist}
+Release:        5%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -25,8 +25,9 @@ Patch0:         ghc-chalmers-lava2000-re
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.7.0
+BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
+BuildRequires:  ghc-doc
+BuildRequires:  ghc-prof
 
 %description
 %{common_description}
@@ -45,12 +46,17 @@ This package provides the shared library
 
 
 %build
-%ghc_lib_build
+%cabal_configure --ghc -p 
+%cabal build
+%cabal haddock
 
 
 %install
 %{__rm} -rf %{buildroot}
-%ghc_lib_install
+%cabal_install
+%cabal_pkg_conf
+
+%ghc_gen_filelists
 
 # cleanup extra data files
 echo "%{_datadir}/%{pkg_name}-%{version}" >> %{name}-devel.files
@@ -63,11 +69,7 @@ echo "%doc tutorial.ps.gz" >> %{name}-do
 %clean
 rm -rf %{buildroot}
 
-
 %changelog
-* Tue Jun 29 2010 Jens Petersen <petersen at redhat.com> - 1.1.1-6
-- update to cabal2spec-0.22.1
-
 * Mon May 24 2010 Jens Petersen <petersen at redhat.com> - 1.1.1-5
 - Keep lava.vhd in datadir so users can find it easily (#546376)
 - Improve summary and description


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-chalmers-lava2000/F-13/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	30 Jun 2010 04:32:19 -0000	1.1
+++ import.log	1 Jul 2010 04:55:22 -0000	1.2
@@ -1 +1,2 @@
 ghc-chalmers-lava2000-1_1_1-6_fc14:HEAD:ghc-chalmers-lava2000-1.1.1-6.fc14.src.rpm:1277871906
+ghc-chalmers-lava2000-1_1_1-5_fc12:F-13:ghc-chalmers-lava2000-1.1.1-5.fc12.src.rpm:1277959744