rpms/ghc-editline/devel ghc-editline.spec,1.13,1.14

Jens Petersen petersen at fedoraproject.org
Mon Jan 11 03:24:20 UTC 2010


Author: petersen

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

Modified Files:
	ghc-editline.spec 
Log Message:
- 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
- drop redundant buildroot and its install cleaning




Index: ghc-editline.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-editline/devel/ghc-editline.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ghc-editline.spec	22 Dec 2009 14:51:09 -0000	1.13
+++ ghc-editline.spec	11 Jan 2010 03:24:20 -0000	1.14
@@ -1,82 +1,47 @@
 %global pkg_name editline
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Haskell %{pkg_name} library
+
+%global common_description A binding to the BSD editline library \
+(http://thrysoee.dk/editline). It provides a basic interface\
+to the editline API for reading lines in input for the user.\
+\
+Additionally, a readline compatibility module is included, which\
+provides a subset of the functionality of the readline library.
+
+%global ghc_pkg_c_deps libedit-devel
+
 %bcond_without shared
 
-# ghc does not emit debug information
+# debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2
 Version:        0.2.1.0
-Release:        12%{?dist}
-Summary:        Haskell %{pkg_name} library
+Release:        13%{?dist}
+Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://code.haskell.org/editline
 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.3.1
-BuildRequires:  libedit-devel
-%if %{with doc}
+BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
 BuildRequires:  ghc-doc
-%endif
-%if %{with prof}
 BuildRequires:  ghc-prof
-%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}}
 
 %description
-This package contains binding to the BSD editline library 
-(http://thrysoee.dk/editline). It provides a basic interface
-to the editline API for reading lines in input for the user.
-
-Additionally, a readline compatibility module is included, which 
-provides a subset of the functionality of the readline library.
-
-%package devel
-Summary:        Haskell %{pkg_name} library development files
-Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(postun): ghc = %{ghc_version}
+%{common_description}
 %if %{with shared}
-Requires:       %{name} = %{version}-%{release}
+This package provides the shared library.
 %endif
-Requires:       libedit-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}
 
-%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}
-
-%description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
-%endif
+%ghc_lib_package
 
 
 %prep
@@ -84,73 +49,30 @@ built for ghc-%{ghc_version}.
 
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
+%cabal_configure --ghc -p
 %cabal build
-%if %{with doc}
 %cabal haddock
-%endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %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> - 0.2.1.0-13
+- 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
+- drop redundant buildroot and its install cleaning
+
 * Tue Dec 22 2009 Jens Petersen <petersen at redhat.com> - 0.2.1.0-12
 - build for ghc-6.12.1
 - added shared library support: needs ghc-rpm-macros 0.3.1



More information about the scm-commits mailing list