rpms/ghc-ghc-paths/devel .cvsignore, 1.2, 1.3 ghc-ghc-paths.spec, 1.5, 1.6 sources, 1.2, 1.3

[Jens Petersen]

Author: petersen

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

Modified Files:
	.cvsignore ghc-ghc-paths.spec sources 
Log Message:
- update to 0.1.0.6
- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
- drop doc and prof bcond
- use common_summary and common_description
- use ghc_lib_package
- build shared library
- drop redundant buildroot and its install cleaning




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc-ghc-paths/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Mar 2009 05:10:56 -0000	1.2
+++ .cvsignore	14 Jan 2010 15:33:58 -0000	1.3
@@ -1 +1 @@
-ghc-paths-0.1.0.5.tar.gz
+ghc-paths-0.1.0.6.tar.gz


Index: ghc-ghc-paths.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-ghc-paths/devel/ghc-ghc-paths.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ghc-ghc-paths.spec	22 Sep 2009 06:21:00 -0000	1.5
+++ ghc-ghc-paths.spec	14 Jan 2010 15:33:58 -0000	1.6
@@ -1,73 +1,37 @@
 %global pkg_name ghc-paths
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Interface to GHC's installation directories
 
-# ghc does not emit debug information
+%global common_description Knowledge of GHC's installation directories.
+
+%bcond_without shared
+
+# debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        0.1.0.5
-Release:        9%{?dist}
-Summary:        Interface to GHC's installation directories
+Version:        0.1.0.6
+Release:        1%{?dist}
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+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
-%if %{with doc}
+BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
 BuildRequires:  ghc-doc
-%endif
-%if %{with prof}
 BuildRequires:  ghc-prof
-%endif
 
 %description
-This package provides the Haskell %{pkg_name} library for ghc.
-
-
-%package devel
-Summary:        Haskell %{pkg_name} library
-Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
-Obsoletes:      ghc-paths < 0.1.0.5-5
-
-%description devel
-This library provides an interface to reading the install directories
-of the ghc compiler.
-
-
-%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}
-Obsoletes:      ghc-paths-doc < 0.1.0.5-5
-
-%description doc
-This package contains development documentation files for the %{name} library.
+%{common_description}
+%if %{with shared}
+This package provides the shared 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}
-Obsoletes:      ghc-paths-prof < 0.1.0.5-5
-
-%description prof
-This package contains profiling libraries for %{name}.
-%endif
+%ghc_lib_package
 
 
 %prep
@@ -75,67 +39,33 @@ This package contains profiling librarie
 
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
+%cabal_configure --ghc -p
 %cabal build
-%if %{with doc}
 %cabal haddock
-%endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
-%ghc_gen_filelists %{name}
+%cabal_pkg_conf
+
+%ghc_gen_filelists
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%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
-
-
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
+%changelog
+* Fri Jan 15 2010 Jens Petersen <petersen at redhat.com> - 0.1.0.6-1
+- update to 0.1.0.6
+- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
+- drop doc and prof bcond
+- use common_summary and common_description
+- use ghc_lib_package
+- build shared library
+- drop redundant buildroot and its install cleaning
 
 
-%changelog
 * Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 0.1.0.5-9
 - rebuild to test versioned ghcdocdir in ghc-rpm-macros
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-ghc-paths/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Mar 2009 05:10:56 -0000	1.2
+++ sources	14 Jan 2010 15:33:58 -0000	1.3
@@ -1 +1 @@
-8fdc122e65845d2d53734f78e22c5155  ghc-paths-0.1.0.5.tar.gz
+3a53051b128953105ae36e58e4d21d0f  ghc-paths-0.1.0.6.tar.gz