[ghc-GLUT/el6/master] update to f14 package
Jens Petersen
petersen at fedoraproject.org
Thu Oct 7 03:22:22 UTC 2010
commit b1d0b784a069b59ee7a29d372893e9faf27ea11b
Author: Jens Petersen <petersen at redhat.com>
Date: Thu Oct 7 13:22:27 2010 +1000
update to f14 package
.gitignore | 2 +-
ghc-GLUT.spec | 166 +++++++++++++++++++--------------------------------------
sources | 2 +-
3 files changed, 57 insertions(+), 113 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ae53d2..d10e547 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-GLUT-2.1.1.2.tar.gz
+GLUT-2.1.2.1.tar.gz
diff --git a/ghc-GLUT.spec b/ghc-GLUT.spec
index 9fa2f7f..03f0948 100644
--- a/ghc-GLUT.spec
+++ b/ghc-GLUT.spec
@@ -1,81 +1,46 @@
%global pkg_name GLUT
-%bcond_without doc
-%bcond_without prof
+%global common_summary Haskell %{pkg_name} library
-# ghc does not emit debug information
+%global common_description The Haskell %{pkg_name} library.\
+This is a set of bindings to the C %{pkg_name} library.
+
+%global ghc_pkg_deps ghc-OpenGL-devel
+
+%global ghc_pkg_c_deps freeglut-devel
+
+%bcond_without shared
+%bcond_without hscolour
+
+# debuginfo is not useful for ghc
%global debug_package %{nil}
Name: ghc-%{pkg_name}
-# part of haskell-platform-2009.2.0.2
-Version: 2.1.1.2
-Release: 2.1%{?dist}
-Summary: Haskell %{pkg_name} library
+# part of haskell-platform-2010.2.0.0
+Version: 2.1.2.1
+Release: 5%{?dist}
+Summary: %{common_summary}
-Group: Development/Libraries
+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-OpenGL-devel
-BuildRequires: freeglut-devel
-BuildRequires: ghc, ghc-rpm-macros
-%if %{with doc}
-BuildRequires: ghc-doc
-BuildRequires: ghc-OpenGL-doc
-%endif
-%if %{with prof}
-BuildRequires: ghc-prof
-BuildRequires: ghc-OpenGL-prof
+BuildRequires: ghc, ghc-doc, ghc-prof
+BuildRequires: ghc-rpm-macros >= 0.8.1
+%if %{with hscolour}
+BuildRequires: hscolour
%endif
+%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
Patch1: ghc-GLUT-extralibs.patch
%description
-This package provides the Haskell %{pkg_name} library for ghc.
-This is a set of bindings to the C %{pkg_name} library.
-
-
-%package devel
-Summary: Haskell %{pkg_name} library
-Group: Development/Libraries
-Requires: ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
-Requires: ghc-OpenGL-devel
-Requires: freeglut-devel
-
-%description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
-
-
-%if %{with doc}
-%package doc
-Summary: Documentation for %{name}
-Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
-Requires: ghc-OpenGL-doc
-
-%description doc
-This package contains development documentation files for the %{name} library.
-%endif
-
-
-%if %{with prof}
-%package prof
-Summary: Profiling libraries for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
-Requires: ghc-OpenGL-prof
-
-%description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
%endif
@@ -85,71 +50,50 @@ built for ghc-%{ghc_version}.
%build
-%cabal_configure --ghc %{?with_prof:-p}
-%cabal build
-%if %{with doc}
-%cabal haddock
-%endif
-%ghc_gen_scripts
+%ghc_lib_build
%install
rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%ghc_install_scripts
-%ghc_gen_filelists %{name}
+%ghc_lib_install
-%clean
-rm -rf $RPM_BUILD_ROOT
+%ghc_lib_package -o 2.1.2.1-5
-%post devel
-%ghc_register_pkg
-
-
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
-
-%preun devel
-if [ "$1" -eq 0 ] ; then
- %ghc_unregister_pkg
-fi
-
-
-%if %{with doc}
-%postun doc
-if [ "$1" -eq 0 ] ; then
- %ghc_reindex_haddock
-fi
-%endif
-
-
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
-
-
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
+%clean
+rm -rf $RPM_BUILD_ROOT
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
+%changelog
+* Sat Jul 31 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-5
+- part of haskell-platform-2010.2.0.0
+- ghc-rpm-macros-0.8.1 for doc obsoletes
+- add hscolour
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-4
+- sync cabal2spec-0.22.1
-%changelog
-* Thu Jun 10 2010 Jens Petersen <petersen at redhat.com> - 2.1.1.2-2.1
+* Thu Jun 10 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-3
- add extralibs glut in .cabal file to fix ghci linking
(reported by Ian Collier, #601640)
+* Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-2
+- part of haskell-platform-2010.1.0.0
+- rebuild against ghc-6.12.2
+- condition ghc_lib_package
+
+* Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-1
+- update to 2.1.2.1 (haskell-platform-2009.3.1)
+- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
+- drop doc and prof bcond
+- use ghc_lib_package, ghc_pkg_deps, and ghc_pkg_c_deps
+
+* Sat Dec 26 2009 Jens Petersen <petersen at redhat.com> - 2.1.1.2-3
+- update for ghc-6.12.1: add shared library support
+- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0
+- add common_summary and common_description
+
* Mon Aug 31 2009 Jens Petersen <petersen at redhat.com> - 2.1.1.2-2
- move BRs to source (base) package
diff --git a/sources b/sources
index 7ce1252..745d013 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-67e5996a7fe56af764393f1cf80b9a43 GLUT-2.1.1.2.tar.gz
+b97f476a04098701e330e86c1f89ed52 GLUT-2.1.2.1.tar.gz
More information about the scm-commits
mailing list