rpms/ghc-dataenc/devel ghc-dataenc.spec,1.2,1.3

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ghc-dataenc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9337

Modified Files:
	ghc-dataenc.spec 
Log Message:
sync cabal2spec-0.22


Index: ghc-dataenc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-dataenc/devel/ghc-dataenc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-dataenc.spec	24 Apr 2010 09:16:18 -0000	1.2
+++ ghc-dataenc.spec	26 Jun 2010 10:08:38 -0000	1.3
@@ -1,3 +1,5 @@
+# cabal2spec falsely detects this as a binlib package because of tests
+
 %global pkg_name dataenc
 
 %global common_summary Haskell encoding library
@@ -13,18 +15,18 @@ uuencode, xxencode, and yEncoding.
 
 Name:           ghc-%{pkg_name}
 Version:        0.13.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
-BuildRequires:  ghc-doc
-BuildRequires:  ghc-prof
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.7.0
 
 %description
 %{common_description}
@@ -41,16 +43,12 @@ This package provides the shared library
 
 
 %build
-%cabal_configure --ghc -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
 
 
 %install
-%cabal_install
-%cabal_pkg_conf
-
-%ghc_gen_filelists
+rm -rf $RPM_BUILD_ROOT
+%ghc_lib_install
 
 
 %clean
@@ -58,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 0.13.0.2-3
+- sync cabal2spec-0.22
+
 * Sat Apr 24 2010 Jens Petersen <petersen at redhat.com> - 0.13.0.2-2
 - rebuild against ghc-6.12.2
 - condition ghc_lib_package