rpms/ghc-OpenGL/devel ghc-OpenGL.spec,1.8,1.9
Jens Petersen
petersen at fedoraproject.org
Sat Jun 26 13:31:29 UTC 2010
Author: petersen
Update of /cvs/extras/rpms/ghc-OpenGL/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27642
Modified Files:
ghc-OpenGL.spec
Log Message:
sync cabal2spec-0.22
Index: ghc-OpenGL.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-OpenGL/devel/ghc-OpenGL.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ghc-OpenGL.spec 27 Apr 2010 02:32:38 -0000 1.8
+++ ghc-OpenGL.spec 26 Jun 2010 13:31:29 -0000 1.9
@@ -14,18 +14,18 @@
Name: ghc-%{pkg_name}
# part of haskell-platform-2010.1.0.0
Version: 2.2.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
License: BSD
URL: http://www.haskell.org/haskellwiki/Opengl
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
%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
%description
@@ -43,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
@@ -60,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 2.2.3.0-3
+- sync cabal2spec-0.22
+
* Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 2.2.3.0-2
- part of haskell-platform-2010.1.0.0
- rebuild against ghc-6.12.2
More information about the scm-commits
mailing list