[ghc-OpenGL] update to cabal2spec-0.24.1 and append _isa to mesa-libGL*-devel requires
Jens Petersen
petersen at fedoraproject.org
Sat Nov 12 13:01:57 UTC 2011
commit 757d2db81c487dd9d3124d68e9be392a83cb69f3
Author: Jens Petersen <petersen at redhat.com>
Date: Sat Nov 12 22:01:54 2011 +0900
update to cabal2spec-0.24.1 and append _isa to mesa-libGL*-devel requires
ghc-OpenGL.spec | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
---
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec
index 79b6de8..0f5c080 100644
--- a/ghc-OpenGL.spec
+++ b/ghc-OpenGL.spec
@@ -4,28 +4,49 @@
%global common_description Haskell bindings to the OpenGL graphics library.
-%global ghc_pkg_c_deps mesa-libGL-devel, mesa-libGLU-devel
-
Name: ghc-%{pkg_name}
# part of haskell-platform-2011.2.0.1
Version: 2.2.3.0
-Release: 10%{?dist}.3
+Release: 11%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
License: BSD
-URL: http://www.haskell.org/haskellwiki/Opengl
+# 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
ExclusiveArch: %{ghc_arches}
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
+%if %{undefined without_hscolour}
BuildRequires: hscolour
-%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
+%endif
+# END cabal2spec
+BuildRequires: ghc-base-prof
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-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
+Requires: mesa-libGL-devel%{?_isa}
+Requires: mesa-libGLU-devel%{?_isa}
+
+%description -n ghc-%{pkg_name}-devel
+%{common_description}
+
+This package contains the development files.
+
+
%prep
%setup -q -n %{pkg_name}-%{version}
@@ -38,10 +59,27 @@ BuildRequires: hscolour
%ghc_lib_install
-%ghc_lib_package
+%post -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%postun -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%if %{undefined ghc_without_shared}
+%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
+%endif
+
+
+%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
%changelog
+* Fri Nov 11 2011 Jens Petersen <petersen at redhat.com> - 2.2.3.0-11
+- update to cabal2spec-0.24.1
+- append _isa to mesa-libGL*-devel requires
+
* Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 2.2.3.0-10.3
- rebuild with new gmp without compat lib
More information about the scm-commits
mailing list