rpms/ghc-editline/devel ghc-editline.spec,1.9,1.10

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-editline.spec 
Log Message:
- sync with current cabal2spec template to minimise cabal2spec-diff
  - preun fixes postun uninstall error




Index: ghc-editline.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-editline/devel/ghc-editline.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ghc-editline.spec	27 Jul 2009 16:05:08 -0000	1.9
+++ ghc-editline.spec	16 Sep 2009 07:50:59 -0000	1.10
@@ -1,28 +1,30 @@
 %global pkg_name editline
-%global debug_package %{nil}
 
 %bcond_without doc
 %bcond_without prof
 
-Name:		ghc-%{pkg_name}
-Version:	0.2.1.0
-Release:	10%{?dist}
-Summary:	Haskell %{pkg_name} library
-Group:		Development/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)
-
-ExclusiveArch:	%{ix86} x86_64 ppc alpha
-
-BuildRequires:	ghc >= 6.10, ghc-rpm-macros, libedit-devel
-%if %{with_doc}
-BuildRequires:	ghc-doc
-%endif
+# ghc does not emit debug information
+%global debug_package %{nil}
 
-%if %{with_prof}
-BuildRequires:	ghc-prof
+Name:           ghc-%{pkg_name}
+Version:        0.2.1.0
+Release:        11%{?dist}
+Summary:        Haskell %{pkg_name} library
+
+Group:          Development/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
+BuildRequires:  libedit-devel
+%if %{with doc}
+BuildRequires:  ghc-doc
+%endif
+%if %{with prof}
+BuildRequires:  ghc-prof
 %endif
 
 %description
@@ -34,100 +36,113 @@ Additionally, a readline compatibility m
 provides a subset of the functionality of the readline library.
 
 %package devel
-Summary:	 Haskell %{pkg_name} library
-Group:		 Development/Libraries
-Requires:	 libedit-devel
-Requires:	 ghc = %{ghc_version}
-Requires(post):	 ghc = %{ghc_version}
-Requires(postun):    ghc = %{ghc_version}
-Requires:	     libedit-devel
+Summary:        Haskell %{pkg_name} library
+Group:          Development/Libraries
+Requires:       ghc = %{ghc_version}
+Requires(post): ghc = %{ghc_version}
+Requires(preun): ghc = %{ghc_version}
+Requires:       libedit-devel
 
 %description devel
-This package will contains the development files for %{name}
-built for ghc-%{ghc_version}
+This package contains the development files for %{name}
+built for ghc-%{ghc_version}.
 
 
-%if %{with_doc}
+%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}
+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
-Thsi package contains the documentation files for the %{name} library
+This package contains development documentation files for the %{name} library.
 %endif
 
-%if %{with_prof}
+
+%if %{with prof}
 %package prof
-Summary:    Profiling libraries for %{name}
-Group:	    Development/Libraries
-Requires:   %{name}-devel = %{version}-%{release}
-Requires:   ghc-prof = %{ghc_version}
+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-%{version}
+built for ghc-%{ghc_version}.
 %endif
 
+
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
+
 %build
 %cabal_configure --ghc %{?with_prof:-p}
 %cabal build
-
-%if %{with_doc}
+%if %{with doc}
 %cabal haddock
 %endif
-
 %ghc_gen_scripts
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %cabal_install
 %ghc_install_scripts
 %ghc_gen_filelists %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post devel 
+%post devel
 %ghc_register_pkg
 
-%if %{with_doc}
+
+%if %{with doc}
 %post doc
 %ghc_reindex_haddock
 %endif
 
-%postun devel
+
+%preun devel
 if [ "$1" -eq 0 ] ; then
-   %ghc_unregister_pkg
+  %ghc_unregister_pkg
 fi
 
-%if %{with_doc}
+
+%if %{with doc}
 %postun doc
 if [ "$1" -eq 0 ] ; then
-   %ghc_reindex_haddock
+  %ghc_reindex_haddock
 fi
 %endif
 
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
 
-%if %{with_doc}
+
+%if %{with doc}
 %files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
 %endif
 
-%if %{with_prof}
+
+%if %{with prof}
 %files prof -f %{name}-prof.files
 %defattr(-,root,root,-)
 %endif
 
 %Changelog
+* Wed Sep 16 2009 Jens Petersen <petersen at redhat.com> - 0.2.1.0-11
+- sync with current cabal2spec template to minimise cabal2spec-diff
+  - fixes uninstall error
+
 * Mon Jul 27 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.2.1.0-10
 - Rebuild