rpms/haddock/devel haddock.spec,1.11,1.12

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/haddock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1842

Modified Files:
	haddock.spec 
Log Message:
drop the ghcver subpackage in line with ghc



Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/devel/haddock.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- haddock.spec	19 Feb 2008 18:44:05 -0000	1.11
+++ haddock.spec	23 Jun 2008 06:18:04 -0000	1.12
@@ -1,9 +1,8 @@
-%define ghc_version 6.8.2
-%define ghcver ghc682
+%define ghc_version 6.8.3
 
 Name:           haddock
 Version:        2.0.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Haddock documentation tool for annotated Haskell source code
 
 Group:          Development/Tools
@@ -17,20 +16,6 @@
 BuildRequires:  ghc = %{ghc_version}
 BuildRequires:  coreutils libxslt docbook-style-xsl autoconf
 
-
-%package -n ghc-%{name}
-Summary:  Libraries for working with Haddock from Haskell code
-Group:    Development/Libraries
-Requires:  ghc = %{ghc_version}
-Requires: %{ghcver}-%{name} = %{version}-%{release}
-
-
-%package -n %{ghcver}-%{name}
-Summary:  Libraries for working with Haddock from Haskell code
-Group:    Development/Libraries
-Requires: %{ghcver}
-
-
 %description
 Haddock is a tool for automatically generating hyperlinked documentation from
 annotated Haskell source code. It is primary intended for documenting
@@ -39,10 +24,13 @@
 Haddock lets you write documentation annotations next to the definitions of
 functions and types in the source code in a lightweight syntax.
 
-%description -n ghc-%{name}
-Libraries for working with Haddock from Haskell code.
 
-%description -n %{ghcver}-%{name}
+%package -n ghc-%{name}
+Summary:  Libraries for working with Haddock from Haskell code
+Group:    Development/Libraries
+Requires:  ghc = %{ghc_version}
+
+%description -n ghc-%{name}
 Libraries for working with Haddock from Haskell code.
 
 
@@ -81,10 +69,6 @@
 
 %files -n ghc-%{name}
 %defattr(-,root,root)
-
-
-%files -n %{ghcver}-%{name}
-%defattr(-,root,root)
 %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
 
 
@@ -97,6 +81,9 @@
 
 
 %changelog
+* Mon Jun 23 2008 Jens Petersen <petersen at redhat.com> - 2.0.0.0-3
+- drop ghcver subpackage in line with ghc
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.0.0-2
 - Autorebuild for GCC 4.3