rpms/ghc-GLUT/devel .cvsignore, 1.2, 1.3 ghc-GLUT.spec, 1.6, 1.7 sources, 1.2, 1.3

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ghc-GLUT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21952

Modified Files:
	.cvsignore ghc-GLUT.spec sources 
Log Message:
- 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




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc-GLUT/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Aug 2009 16:12:55 -0000	1.2
+++ .cvsignore	11 Jan 2010 05:31:08 -0000	1.3
@@ -1 +1 @@
-GLUT-2.1.1.2.tar.gz
+GLUT-2.1.2.1.tar.gz


Index: ghc-GLUT.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-GLUT/devel/ghc-GLUT.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ghc-GLUT.spec	25 Dec 2009 16:35:25 -0000	1.6
+++ ghc-GLUT.spec	11 Jan 2010 05:31:08 -0000	1.7
@@ -5,17 +5,19 @@
 %global common_description The Haskell %{pkg_name} library.\
 This is a set of bindings to the C %{pkg_name} library.
 
-%bcond_without doc
-%bcond_without prof
+%global ghc_pkg_deps ghc-OpenGL-devel
+
+%global ghc_pkg_c_deps freeglut-devel
+
 %bcond_without shared
 
-# ghc does not emit debug information
-#%%global debug_package %{nil}
+# 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:        3%{?dist}
+# part of haskell-platform-2009.3.1
+Version:        2.1.2.1
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -24,17 +26,11 @@ URL:            http://www.haskell.org/h
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros >= 0.4.0
-BuildRequires:  ghc-OpenGL-devel
-%if %{with doc}
+BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
 BuildRequires:  ghc-doc
-BuildRequires:  ghc-OpenGL-doc
-%endif
-%if %{with prof}
 BuildRequires:  ghc-prof
-BuildRequires:  ghc-OpenGL-prof
-%endif
-BuildRequires:  freeglut-devel
+%{?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}}
 
 %description
 %{common_description}
@@ -43,45 +39,7 @@ This package provides the shared library
 %endif
 
 
-%package devel
-Summary:        %{common_summary} development files
-Group:          Development/Libraries
-%{?ghc_requires}
-Requires:       ghc-OpenGL-devel
-Requires:       freeglut-devel
-
-%description devel
-%{common_description}
-
-This package contains the development files.
-
-
-%if %{with doc}
-%package doc
-Summary:        Documentation for %{common_summary}
-Group:          Development/Libraries
-%{?ghc_doc_requires}
-Requires:       ghc-OpenGL-doc
-
-%description doc
-%{common_description}
-
-This package contains development documentation files.
-%endif
-
-
-%if %{with prof}
-%package prof
-Summary:        Profiling libraries for %{common_summary}
-Group:          Development/Libraries
-%{?ghc_prof_requires}
-Requires:       ghc-OpenGL-prof
-
-%description prof
-%{common_description}
-
-This package contains the profiling library.
-%endif
+%ghc_lib_package
 
 
 %prep
@@ -89,73 +47,29 @@ This package contains the profiling libr
 
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
+%cabal_configure --ghc -p
 %cabal build
-%if %{with doc}
 %cabal haddock
-%endif
 
 
 %install
 %cabal_install
 %cabal_pkg_conf
 
-%ghc_gen_filelists %{name}
+%ghc_gen_filelists
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post devel
-ghc-pkg recache
-
-
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
-
-%postun devel
-ghc-pkg recache
-
-
-%if %{with doc}
-%postun doc
-if [ "$1" -eq 0 ] ; then
-  %ghc_reindex_haddock
-fi
-%endif
-
-
-%if %{with shared}
-%files -f %{name}.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
-%endif
-
-
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%if %{without shared}
-%{_docdir}/%{name}-%{version}
-%endif
-
-
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
-
-
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
-
-
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-GLUT/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Aug 2009 16:12:55 -0000	1.2
+++ sources	11 Jan 2010 05:31:08 -0000	1.3
@@ -1 +1 @@
-67e5996a7fe56af764393f1cf80b9a43  GLUT-2.1.1.2.tar.gz
+b97f476a04098701e330e86c1f89ed52  GLUT-2.1.2.1.tar.gz