packages: ghc-dataenc/ghc-dataenc.spec, ghc-hashed-storage/ghc-hashed-stora...

glen glen at pld-linux.org
Mon Feb 28 10:27:26 CET 2011


Author: glen                         Date: Mon Feb 28 09:27:26 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update packaging, %requires_eq dep on ghc

---- Files affected:
packages/ghc-dataenc:
   ghc-dataenc.spec (1.7 -> 1.8) 
packages/ghc-hashed-storage:
   ghc-hashed-storage.spec (1.12 -> 1.13) 
packages/ghc-haskeline:
   ghc-haskeline.spec (1.9 -> 1.10) 
packages/ghc-haskell-src:
   ghc-haskell-src.spec (1.4 -> 1.5) 
packages/ghc-haskell-src-exts:
   ghc-haskell-src-exts.spec (1.4 -> 1.5) 
packages/ghc-hslogger:
   ghc-hslogger.spec (1.3 -> 1.4) 
packages/ghc-mmap:
   ghc-mmap.spec (1.11 -> 1.12) 
packages/ghc-terminfo:
   ghc-terminfo.spec (1.8 -> 1.9) 
packages/ghc-transformers:
   ghc-transformers.spec (1.4 -> 1.5) 
packages/ghc-uniplate:
   ghc-uniplate.spec (1.4 -> 1.5) 
packages/ghc-utf8-string:
   ghc-utf8-string.spec (1.9 -> 1.10) 
packages/ghc-zlib:
   ghc-zlib.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/ghc-dataenc/ghc-dataenc.spec
diff -u packages/ghc-dataenc/ghc-dataenc.spec:1.7 packages/ghc-dataenc/ghc-dataenc.spec:1.8
--- packages/ghc-dataenc/ghc-dataenc.spec:1.7	Thu Feb 24 12:32:09 2011
+++ packages/ghc-dataenc/ghc-dataenc.spec	Mon Feb 28 10:27:21 2011
@@ -3,7 +3,7 @@
 Summary:	Data encoding library
 Name:		ghc-%{pkgname}
 Version:	0.13.0.3
-Release:	4
+Release:	5
 License:	BSD
 Group:		Development/Languages
 Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -11,14 +11,28 @@
 URL:		http://hackage.haskell.org/package/dataenc/
 BuildRequires:	ghc >= 6.12.3
 BuildRequires:	rpmbuild(macros) >= 1.608
-%requires_releq	ghc
+%requires_eq	ghc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# debuginfo is not useful for ghc
+%define		_enable_debug_packages	0
+
 %description
 Data encoding library currently providing Base16, Base32,
 Base32Hex, Base64, Base64Url, Base85, Python string escaping,
 Quoted-Printable, URL encoding, uuencode, xxencode, and yEncoding.
 
+%package doc
+Summary:	HTML documentation for %{pkgname}
+Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla %{pkgname}
+Group:		Documentation
+
+%description doc
+HTML documentation for %{pkgname}.
+
+%description doc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
+
 %prep
 %setup -q -n %{pkgname}-%{version}
 
@@ -40,7 +54,7 @@
 
 # work around automatic haddock docs installation
 rm -rf %{name}-%{version}-doc
-cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc
 
 runhaskell Setup.hs register \
 	--gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
@@ -56,16 +70,22 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{name}-%{version}-doc/html
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 
+%files doc
+%defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2011/02/28 09:27:21  glen
+- update packaging, %requires_eq dep on ghc
+
 Revision 1.7  2011/02/24 11:32:09  glen
 - release 4
 

================================================================
Index: packages/ghc-hashed-storage/ghc-hashed-storage.spec
diff -u packages/ghc-hashed-storage/ghc-hashed-storage.spec:1.12 packages/ghc-hashed-storage/ghc-hashed-storage.spec:1.13
--- packages/ghc-hashed-storage/ghc-hashed-storage.spec:1.12	Thu Feb 24 12:32:07 2011
+++ packages/ghc-hashed-storage/ghc-hashed-storage.spec	Mon Feb 28 10:27:21 2011
@@ -3,7 +3,7 @@
 Summary:	Hashed file storage support code
 Name:		ghc-%{pkgname}
 Version:	0.5.2
-Release:	3
+Release:	4
 License:	BSD
 Group:		Development/Languages
 Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -15,13 +15,16 @@
 BuildRequires:	ghc-mmap >= 1:0.5
 BuildRequires:	ghc-zlib
 BuildRequires:	rpmbuild(macros) >= 1.608
-%requires_releq	ghc
 Requires:	ghc-binary
 Requires:	ghc-dataenc
-%requires_releq	ghc-mmap
 Requires:	ghc-zlib
+%requires_eq	ghc
+%requires_eq	ghc-mmap
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# debuginfo is not useful for ghc
+%define		_enable_debug_packages	0
+
 %description
 Support code for reading and manipulating hashed file storage (where
 each file and directory is associated with a cryptographic hash, for
@@ -31,6 +34,17 @@
 filesystem tree and an indexed plain tree (where the index maintains
 hashes of the plain files and directories).
 
+%package doc
+Summary:	HTML documentation for %{pkgname}
+Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla %{pkgname}
+Group:		Documentation
+
+%description doc
+HTML documentation for %{pkgname}.
+
+%description doc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
+
 %prep
 %setup -q -n %{pkgname}-%{version}
 
@@ -39,7 +53,7 @@
 	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
 	--libexecdir=%{_libexecdir} \
-	--docdir=%{_defaultdocdir}/%{name}-%{version}
+	--docdir=%{_docdir}/%{name}-%{version}
 
 runhaskell Setup.hs build
 runhaskell Setup.hs haddock --executables
@@ -52,7 +66,7 @@
 
 # work around automatic haddock docs installation
 rm -rf %{name}-%{version}-doc
-cp -a $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version} %{name}-%{version}-doc
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc
 
 runhaskell Setup.hs register \
 	--gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
@@ -69,16 +83,22 @@
 %files
 %defattr(644,root,root,755)
 %doc NEWS
-%doc %{name}-%{version}-doc/html
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 
+%files doc
+%defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2011/02/28 09:27:21  glen
+- update packaging, %requires_eq dep on ghc
+
 Revision 1.12  2011/02/24 11:32:07  glen
 - release 3
 

================================================================
Index: packages/ghc-haskeline/ghc-haskeline.spec
diff -u packages/ghc-haskeline/ghc-haskeline.spec:1.9 packages/ghc-haskeline/ghc-haskeline.spec:1.10
--- packages/ghc-haskeline/ghc-haskeline.spec:1.9	Thu Feb 24 12:32:09 2011
+++ packages/ghc-haskeline/ghc-haskeline.spec	Mon Feb 28 10:27:22 2011
@@ -3,7 +3,7 @@
 Summary:	A command-line interface for user input, written in Haskell
 Name:		ghc-%{pkgname}
 Version:	0.6.2.3
-Release:	4
+Release:	5
 License:	BSD
 Group:		Development/Languages
 Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -14,11 +14,14 @@
 BuildRequires:	ghc-utf8-string >= 0.3.6
 BuildRequires:	gmp-devel
 BuildRequires:	rpmbuild(macros) >= 1.608
-%requires_releq	ghc
+%requires_eq	ghc
 Requires:	ghc-mtl
 Requires:	ghc-utf8-string >= 0.3.6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# debuginfo is not useful for ghc
+%define		_enable_debug_packages	0
+
 %description
 Haskeline provides a user interface for line input in command-line
 programs. This library is similar in purpose to readline, but since it
@@ -46,7 +49,7 @@
 
 # work around automatic haddock docs installation
 rm -rf %{name}-%{version}-doc
-cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc
 
 runhaskell Setup.hs register \
 	--gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
@@ -63,16 +66,22 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGES
-%doc %{name}-%{version}-doc/html
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 
+%files doc
+%defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2011/02/28 09:27:22  glen
+- update packaging, %requires_eq dep on ghc
+
 Revision 1.9  2011/02/24 11:32:09  glen
 - release 4
 

================================================================
Index: packages/ghc-haskell-src/ghc-haskell-src.spec
diff -u packages/ghc-haskell-src/ghc-haskell-src.spec:1.4 packages/ghc-haskell-src/ghc-haskell-src.spec:1.5
--- packages/ghc-haskell-src/ghc-haskell-src.spec:1.4	Thu Feb 24 12:32:06 2011
+++ packages/ghc-haskell-src/ghc-haskell-src.spec	Mon Feb 28 10:27:22 2011
@@ -3,7 +3,7 @@
 Summary:	Support for manipulating Haskell source code
 Name:		ghc-%{pkgname}
 Version:	1.0.1.4
-Release:	2
+Release:	3
 License:	BSD
 Group:		Development/Languages
 Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -11,14 +11,28 @@
 URL:		http://hackage.haskell.org/package/haskell-src/
 BuildRequires:	ghc >= 6.12.3
 BuildRequires:	rpmbuild(macros) >= 1.608
-%requires_releq	ghc
+%requires_eq	ghc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# debuginfo is not useful for ghc
+%define		_enable_debug_packages	0
+
 %description
 The haskell-src package provides support for manipulating Haskell
 source code. The package provides a lexer, parser and pretty-printer,
-and a definition of a Haskell abstract syntax tree (AST).
-Common uses of this package are to parse or generate Haskell 98 code. 
+and a definition of a Haskell abstract syntax tree (AST). Common uses
+of this package are to parse or generate Haskell 98 code.
+
+%package doc
+Summary:	HTML documentation for %{pkgname}
+Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla %{pkgname}
+Group:		Documentation
+
+%description doc
+HTML documentation for %{pkgname}.
+
+%description doc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
@@ -41,7 +55,7 @@
 
 # work around automatic haddock docs installation
 rm -rf %{name}-%{version}-doc
-cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc
 
 runhaskell Setup.hs register \
 	--gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
@@ -57,16 +71,22 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{name}-%{version}-doc/html
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 
+%files doc
+%defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/02/28 09:27:22  glen
+- update packaging, %requires_eq dep on ghc
+
 Revision 1.4  2011/02/24 11:32:06  glen
 - release 2
 

================================================================
Index: packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec
diff -u packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec:1.4 packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec:1.5
--- packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec:1.4	Thu Feb 24 12:32:07 2011
+++ packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec	Mon Feb 28 10:27:22 2011
@@ -3,7 +3,7 @@
 Summary:	Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
 Name:		ghc-%{pkgname}
 Version:	1.9.6
-Release:	3
+Release:	4
 License:	BSD
 Group:		Development/Languages
 Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -13,9 +13,12 @@
 BuildRequires:	ghc >= 6.12.3
 BuildRequires:	rpmbuild(macros) >= 1.608
 Requires:	cpphs
-%requires_releq	ghc
+%requires_eq	ghc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# debuginfo is not useful for ghc
+%define		_enable_debug_packages	0
+
 %description
 Haskell-Source with Extensions (HSE, haskell-src-exts) is an extension
 of the standard haskell-src package, and handles most registered
@@ -32,6 +35,17 @@
 Apart from these standard extensions, it also handles regular patterns
 as per the HaRP extension as well as HSX-style embedded XML syntax.
 
+%package doc
+Summary:	HTML documentation for %{pkgname}
+Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla %{pkgname}
+Group:		Documentation
+
+%description doc
+HTML documentation for %{pkgname}.
+
+%description doc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
+
 %prep
 %setup -q -n %{pkgname}-%{version}
 
@@ -53,7 +67,7 @@
 
 # work around automatic haddock docs installation
 rm -rf %{name}-%{version}-doc
-cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc
 
 runhaskell Setup.hs register \
 	--gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
@@ -70,16 +84,22 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG
-%doc %{name}-%{version}-doc/html
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 
+%files doc
+%defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/02/28 09:27:22  glen
+- update packaging, %requires_eq dep on ghc
+
 Revision 1.4  2011/02/24 11:32:07  glen
 - release 3
 

================================================================
Index: packages/ghc-hslogger/ghc-hslogger.spec
diff -u packages/ghc-hslogger/ghc-hslogger.spec:1.3 packages/ghc-hslogger/ghc-hslogger.spec:1.4
--- packages/ghc-hslogger/ghc-hslogger.spec:1.3	Thu Feb 24 12:32:06 2011
+++ packages/ghc-hslogger/ghc-hslogger.spec	Mon Feb 28 10:27:22 2011
@@ -3,7 +3,7 @@
 Summary:	Versatile logging framework for Haskell
 Name:		ghc-%{pkgname}
 Version:	1.1.0
-Release:	2
+Release:	3
 License:	LGPL
 Group:		Development/Languages
 Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -11,18 +11,31 @@
 URL:		http://hackage.haskell.org/package/hslogger/
 BuildRequires:	ghc >= 6.12.3
 BuildRequires:	rpmbuild(macros) >= 1.608
-%requires_releq	ghc
+%requires_eq	ghc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# debuginfo is not useful for ghc
+%define		_enable_debug_packages	0
+
 %description
-hslogger is a logging framework for Haskell, roughly similar to Python's
-logging module.
+hslogger is a logging framework for Haskell, roughly similar to
+Python's logging module.
+
+hslogger lets each log message have a priority and source be
+associated with it. The programmer can then define global handlers
+that route or filter messages based on the priority and source.
+hslogger also has a syslog handler built in.
+
+%package doc
+Summary:	HTML documentation for %{pkgname}
+Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla %{pkgname}
+Group:		Documentation
 
-hslogger lets each log message have a priority and source be associated with
-it.  The programmer can then define global handlers that route or filter
-messages based on the priority and source.  hslogger also has a syslog handler
-built in.
+%description doc
+HTML documentation for %{pkgname}.
 
+%description doc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
@@ -45,7 +58,7 @@
 
 # work around automatic haddock docs installation
 rm -rf %{name}-%{version}-doc
-cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc
 
 runhaskell Setup.hs register \
 	--gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
@@ -61,16 +74,22 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{name}-%{version}-doc/html
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 
+%files doc
+%defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/02/28 09:27:22  glen
+- update packaging, %requires_eq dep on ghc
+
 Revision 1.3  2011/02/24 11:32:06  glen
 - release 2
 

================================================================
Index: packages/ghc-mmap/ghc-mmap.spec
diff -u packages/ghc-mmap/ghc-mmap.spec:1.11 packages/ghc-mmap/ghc-mmap.spec:1.12
--- packages/ghc-mmap/ghc-mmap.spec:1.11	Thu Feb 24 12:32:10 2011
+++ packages/ghc-mmap/ghc-mmap.spec	Mon Feb 28 10:27:22 2011
@@ -3,7 +3,7 @@
 Summary:	Memory mapped files for POSIX and Windows
 Name:		ghc-%{pkgname}
 Version:	0.5.6
-Release:	5
+Release:	6
 Epoch:		1
 License:	BSD
 Group:		Development/Languages
@@ -13,16 +13,29 @@
 BuildRequires:	ghc >= 6.12.3
 BuildRequires:	ghc-HUnit
 BuildRequires:	rpmbuild(macros) >= 1.608
-%requires_releq	ghc
+%requires_eq	ghc
 Requires:	ghc-HUnit
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# debuginfo is not useful for ghc
+%define		_enable_debug_packages	0
+
 %description
-This library provides a wrapper to mmap(2) or MapViewOfFile,
-allowing files or devices to be lazily loaded into memory
-as strict or lazy ByteStrings, ForeignPtrs or plain Ptrs,
-using the virtual memory subsystem to do on-demand loading.
-Modifications are also supported. 
+This library provides a wrapper to mmap(2) or MapViewOfFile, allowing
+files or devices to be lazily loaded into memory as strict or lazy
+ByteStrings, ForeignPtrs or plain Ptrs, using the virtual memory
+subsystem to do on-demand loading. Modifications are also supported.
+
+%package doc
+Summary:	HTML documentation for %{pkgname}
+Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla %{pkgname}
+Group:		Documentation
+
+%description doc
+HTML documentation for %{pkgname}.
+
+%description doc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
@@ -45,7 +58,7 @@
 
 # work around automatic haddock docs installation
 rm -rf %{name}-%{version}-doc
-cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc
 
 runhaskell Setup.hs register \
 	--gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
@@ -61,16 +74,22 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{name}-%{version}-doc/html
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 
+%files doc
+%defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2011/02/28 09:27:22  glen
+- update packaging, %requires_eq dep on ghc
+
 Revision 1.11  2011/02/24 11:32:10  glen
 - release 5
 

================================================================
Index: packages/ghc-terminfo/ghc-terminfo.spec
diff -u packages/ghc-terminfo/ghc-terminfo.spec:1.8 packages/ghc-terminfo/ghc-terminfo.spec:1.9
--- packages/ghc-terminfo/ghc-terminfo.spec:1.8	Thu Feb 24 12:32:07 2011
+++ packages/ghc-terminfo/ghc-terminfo.spec	Mon Feb 28 10:27:22 2011
@@ -3,7 +3,7 @@
 Summary:	Haskell bindings to the terminfo library
 Name:		ghc-%{pkgname}
 Version:	0.3.1.3
-Release:	3
+Release:	4
 License:	BSD
 Group:		Development/Languages
 Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -13,16 +13,30 @@
 BuildRequires:	gmp-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	rpmbuild(macros) >= 1.608
-%requires_releq	ghc
+%requires_eq	ghc
 Requires:	ncurses-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# debuginfo is not useful for ghc
+%define		_enable_debug_packages	0
+
 %description
 This library provides an interface to the terminfo database (via
 bindings to the curses library). Terminfo allows POSIX systems to
 interact with a variety of terminals using a standard set of
 capabilities.
 
+%package doc
+Summary:	HTML documentation for %{pkgname}
+Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla %{pkgname}
+Group:		Documentation
+
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-dataenc/ghc-dataenc.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-hashed-storage/ghc-hashed-storage.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-haskeline/ghc-haskeline.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-haskell-src/ghc-haskell-src.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-hslogger/ghc-hslogger.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-mmap/ghc-mmap.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-terminfo/ghc-terminfo.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-transformers/ghc-transformers.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-uniplate/ghc-uniplate.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-utf8-string/ghc-utf8-string.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-zlib/ghc-zlib.spec?r1=1.7&r2=1.8&f=u



More information about the pld-cvs-commit mailing list