Author: baggins Date: Fri Aug 27 20:29:28 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated packaging to new template (ghc 6.12.3+)
---- Files affected: packages/ghc-binary: ghc-binary.spec (1.4 -> 1.5) packages/ghc-dataenc: ghc-dataenc.spec (1.1 -> 1.2) packages/ghc-hashed-storage: ghc-hashed-storage.spec (1.5 -> 1.6) packages/ghc-haskeline: ghc-haskeline.spec (1.2 -> 1.3) packages/ghc-mmap: ghc-mmap.spec (1.2 -> 1.3) packages/ghc-terminfo: ghc-terminfo.spec (1.2 -> 1.3) packages/ghc-utf8-string: ghc-utf8-string.spec (1.2 -> 1.3) packages/ghc-zlib: ghc-zlib.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/ghc-binary/ghc-binary.spec diff -u packages/ghc-binary/ghc-binary.spec:1.4 packages/ghc-binary/ghc-binary.spec:1.5 --- packages/ghc-binary/ghc-binary.spec:1.4 Sat Apr 10 17:59:49 2010 +++ packages/ghc-binary/ghc-binary.spec Fri Aug 27 22:29:22 2010 @@ -9,11 +9,11 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz # Source0-md5: 6bf8f3d1441602c9ab09a75e3bd6e926 URL: http://hackage.haskell.org/package/%{pkgname}/ -BuildRequires: ghc >= 6.10 +BuildRequires: ghc >= 6.12.3 %requires_eq ghc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define libsubdir ghc-%(/usr/bin/ghc --numeric-version)/%{pkgname}-%{version} +%define ghcdir ghc-%(/usr/bin/ghc --numeric-version) %description Efficient, pure binary serialisation using lazy ByteStrings. Haskell @@ -30,7 +30,6 @@ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ - --libsubdir=%{libsubdir} \ --docdir=%{_docdir}/%{name}-%{version} ./Setup.lhs build @@ -38,6 +37,8 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d + ./Setup.lhs copy --destdir=$RPM_BUILD_ROOT # work around automatic haddock docs installation @@ -45,24 +46,23 @@ cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc ./Setup.lhs register \ - --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{libsubdir}/%{pkgname}.conf + --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf %clean rm -rf $RPM_BUILD_ROOT %post -/usr/bin/ghc-pkg update %{_libdir}/%{libsubdir}/%{pkgname}.conf +/usr/bin/ghc-pkg recache %postun -if [ "$1" = "0" ]; then - /usr/bin/ghc-pkg unregister %{pkgname}-%{version} -fi +/usr/bin/ghc-pkg recache %files %defattr(644,root,root,755) %doc README todo %doc %{name}-%{version}-doc/html -%{_libdir}/%{libsubdir} +%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf +%{_libdir}/%{ghcdir}/%{pkgname}-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -70,6 +70,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2010/08/27 20:29:22 baggins +- updated packaging to new template (ghc 6.12.3+) + Revision 1.4 2010/04/10 15:59:49 baggins - docdir ================================================================ Index: packages/ghc-dataenc/ghc-dataenc.spec diff -u packages/ghc-dataenc/ghc-dataenc.spec:1.1 packages/ghc-dataenc/ghc-dataenc.spec:1.2 --- packages/ghc-dataenc/ghc-dataenc.spec:1.1 Sat Apr 10 18:06:51 2010 +++ packages/ghc-dataenc/ghc-dataenc.spec Fri Aug 27 22:29:22 2010 @@ -9,11 +9,11 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz # Source0-md5: 65f6e8fdbc0adef572afdacd2c492289 URL: http://hackage.haskell.org/package/%{pkgname}/ -BuildRequires: ghc >= 6.10 +BuildRequires: ghc >= 6.12.3 %requires_eq ghc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define libsubdir ghc-%(/usr/bin/ghc --numeric-version)/%{pkgname}-%{version} +%define ghcdir ghc-%(/usr/bin/ghc --numeric-version) %description Data encoding library currently providing Base16, Base32, @@ -28,7 +28,6 @@ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ - --libsubdir=%{libsubdir} \ --docdir=%{_docdir}/%{name}-%{version} runhaskell Setup.hs build @@ -36,6 +35,8 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d + runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT # work around automatic haddock docs installation @@ -43,23 +44,22 @@ cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc runhaskell Setup.hs register \ - --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{libsubdir}/%{pkgname}.conf + --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf %clean rm -rf $RPM_BUILD_ROOT %post -/usr/bin/ghc-pkg update %{_libdir}/%{libsubdir}/%{pkgname}.conf +/usr/bin/ghc-pkg recache %postun -if [ "$1" = "0" ]; then - /usr/bin/ghc-pkg unregister %{pkgname}-%{version} -fi +/usr/bin/ghc-pkg recache %files %defattr(644,root,root,755) %doc %{name}-%{version}-doc/html -%{_libdir}/%{libsubdir} +%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf +%{_libdir}/%{ghcdir}/%{pkgname}-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -67,6 +67,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2010/08/27 20:29:22 baggins +- updated packaging to new template (ghc 6.12.3+) + Revision 1.1 2010/04/10 16:06:51 baggins - initial revision ================================================================ Index: packages/ghc-hashed-storage/ghc-hashed-storage.spec diff -u packages/ghc-hashed-storage/ghc-hashed-storage.spec:1.5 packages/ghc-hashed-storage/ghc-hashed-storage.spec:1.6 --- packages/ghc-hashed-storage/ghc-hashed-storage.spec:1.5 Sat Apr 10 19:08:24 2010 +++ packages/ghc-hashed-storage/ghc-hashed-storage.spec Fri Aug 27 22:29:23 2010 @@ -9,7 +9,7 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz # Source0-md5: 12c5b21a74e0ad1d975ba73c247bf77c URL: http://hackage.haskell.org/package/%{pkgname}/ -BuildRequires: ghc >= 6.10 +BuildRequires: ghc >= 6.12.3 BuildRequires: ghc-binary BuildRequires: ghc-dataenc BuildRequires: ghc-mmap = 1:0.4.1 @@ -21,7 +21,7 @@ Requires: ghc-zlib BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define libsubdir ghc-%(/usr/bin/ghc --numeric-version)/%{pkgname}-%{version} +%define ghcdir ghc-%(/usr/bin/ghc --numeric-version) %description Support code for reading and manipulating hashed file storage (where @@ -40,7 +40,6 @@ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ - --libsubdir=%{libsubdir} \ --docdir=%{_defaultdocdir}/%{name}-%{version} runhaskell Setup.hs build @@ -48,6 +47,8 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d + runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT # work around automatic haddock docs installation @@ -55,24 +56,23 @@ cp -a $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version} %{name}-%{version}-doc runhaskell Setup.hs register \ - --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{libsubdir}/%{pkgname}.conf + --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf %clean rm -rf $RPM_BUILD_ROOT %post -/usr/bin/ghc-pkg update %{_libdir}/%{libsubdir}/%{pkgname}.conf +/usr/bin/ghc-pkg recache %postun -if [ "$1" = "0" ]; then - /usr/bin/ghc-pkg unregister %{pkgname}-%{version} -fi +/usr/bin/ghc-pkg recache %files %defattr(644,root,root,755) %doc NEWS %doc %{name}-%{version}-doc/html -%{_libdir}/%{libsubdir} +%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf +%{_libdir}/%{ghcdir}/%{pkgname}-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -80,6 +80,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2010/08/27 20:29:23 baggins +- updated packaging to new template (ghc 6.12.3+) + Revision 1.5 2010/04/10 17:08:24 baggins - rel 2 - fixed BR/R ================================================================ Index: packages/ghc-haskeline/ghc-haskeline.spec diff -u packages/ghc-haskeline/ghc-haskeline.spec:1.2 packages/ghc-haskeline/ghc-haskeline.spec:1.3 --- packages/ghc-haskeline/ghc-haskeline.spec:1.2 Sun May 16 01:56:44 2010 +++ packages/ghc-haskeline/ghc-haskeline.spec Fri Aug 27 22:29:23 2010 @@ -9,14 +9,14 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz # Source0-md5: c23a8ffbcff7cb42f0ee6ca6946285bb URL: http://hackage.haskell.org/package/%{pkgname}/ -BuildRequires: ghc >= 6.10 +BuildRequires: ghc >= 6.12.3 BuildRequires: ghc-utf8-string >= 0.3.6 BuildRequires: gmp-devel %requires_eq ghc Requires: ghc-utf8-string >= 0.3.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define libsubdir ghc-%(/usr/bin/ghc --numeric-version)/%{pkgname}-%{version} +%define ghcdir ghc-%(/usr/bin/ghc --numeric-version) %description Haskeline provides a user interface for line input in command-line @@ -32,7 +32,6 @@ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ - --libsubdir=%{libsubdir} \ --docdir=%{_docdir}/%{name}-%{version} runhaskell Setup.hs build @@ -40,6 +39,8 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d + runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT # work around automatic haddock docs installation @@ -47,24 +48,23 @@ cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc runhaskell Setup.hs register \ - --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{libsubdir}/%{pkgname}.conf + --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf %clean rm -rf $RPM_BUILD_ROOT %post -/usr/bin/ghc-pkg update %{_libdir}/%{libsubdir}/%{pkgname}.conf +/usr/bin/ghc-pkg recache %postun -if [ "$1" = "0" ]; then - /usr/bin/ghc-pkg unregister %{pkgname}-%{version} -fi +/usr/bin/ghc-pkg recache %files %defattr(644,root,root,755) %doc CHANGES %doc %{name}-%{version}-doc/html -%{_libdir}/%{libsubdir} +%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf +%{_libdir}/%{ghcdir}/%{pkgname}-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -72,6 +72,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2010/08/27 20:29:23 baggins +- updated packaging to new template (ghc 6.12.3+) + Revision 1.2 2010/05/15 23:56:44 sparky - BR: gmp-devel (this probably should be required in ghc) ================================================================ Index: packages/ghc-mmap/ghc-mmap.spec diff -u packages/ghc-mmap/ghc-mmap.spec:1.2 packages/ghc-mmap/ghc-mmap.spec:1.3 --- packages/ghc-mmap/ghc-mmap.spec:1.2 Sat Apr 10 18:26:45 2010 +++ packages/ghc-mmap/ghc-mmap.spec Fri Aug 27 22:29:24 2010 @@ -10,11 +10,11 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz # Source0-md5: 2ebe9772a0efd0a6febfbc67c02faab2 URL: http://hackage.haskell.org/package/%{pkgname}/ -BuildRequires: ghc >= 6.10 +BuildRequires: ghc >= 6.12.3 %requires_eq ghc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define libsubdir ghc-%(/usr/bin/ghc --numeric-version)/%{pkgname}-%{version} +%define ghcdir ghc-%(/usr/bin/ghc --numeric-version) %description This library provides a wrapper to mmap(2) or MapViewOfFile, @@ -31,7 +31,6 @@ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ - --libsubdir=%{libsubdir} \ --docdir=%{_docdir}/%{name}-%{version} runhaskell Setup.hs build @@ -39,6 +38,8 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d + runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT # work around automatic haddock docs installation @@ -46,23 +47,22 @@ cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc runhaskell Setup.hs register \ - --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{libsubdir}/%{pkgname}.conf + --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf %clean rm -rf $RPM_BUILD_ROOT %post -/usr/bin/ghc-pkg update %{_libdir}/%{libsubdir}/%{pkgname}.conf +/usr/bin/ghc-pkg recache %postun -if [ "$1" = "0" ]; then - /usr/bin/ghc-pkg unregister %{pkgname}-%{version} -fi +/usr/bin/ghc-pkg recache %files %defattr(644,root,root,755) %doc %{name}-%{version}-doc/html -%{_libdir}/%{libsubdir} +%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf +%{_libdir}/%{ghcdir}/%{pkgname}-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -70,6 +70,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2010/08/27 20:29:24 baggins +- updated packaging to new template (ghc 6.12.3+) + Revision 1.2 2010/04/10 16:26:45 baggins - unfortunately we have to downgrade to 0.4 see: http://bugs.darcs.net/issue1753 ================================================================ Index: packages/ghc-terminfo/ghc-terminfo.spec diff -u packages/ghc-terminfo/ghc-terminfo.spec:1.2 packages/ghc-terminfo/ghc-terminfo.spec:1.3 --- packages/ghc-terminfo/ghc-terminfo.spec:1.2 Sun May 16 16:48:22 2010 +++ packages/ghc-terminfo/ghc-terminfo.spec Fri Aug 27 22:29:24 2010 @@ -9,14 +9,14 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz # Source0-md5: 5840d32cc06109d23ebda5509fb242a9 URL: http://hackage.haskell.org/package/%{pkgname}/ -BuildRequires: ghc >= 6.10 +BuildRequires: ghc >= 6.12.3 BuildRequires: gmp-devel BuildRequires: ncurses-devel %requires_eq ghc Requires: ncurses-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define libsubdir ghc-%(/usr/bin/ghc --numeric-version)/%{pkgname}-%{version} +%define ghcdir ghc-%(/usr/bin/ghc --numeric-version) %description This library provides an interface to the terminfo database (via @@ -32,7 +32,6 @@ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ - --libsubdir=%{libsubdir} \ --docdir=%{_docdir}/%{name}-%{version} \ --configure-option="--with-curses-includes=/usr/include/ncursesw" @@ -41,6 +40,8 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d + runhaskell Setup.lhs copy --destdir=$RPM_BUILD_ROOT # work around automatic haddock docs installation @@ -48,23 +49,22 @@ cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc runhaskell Setup.lhs register \ - --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{libsubdir}/%{pkgname}.conf + --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf %clean rm -rf $RPM_BUILD_ROOT %post -/usr/bin/ghc-pkg update %{_libdir}/%{libsubdir}/%{pkgname}.conf +/usr/bin/ghc-pkg recache %postun -if [ "$1" = "0" ]; then - /usr/bin/ghc-pkg unregister %{pkgname}-%{version} -fi +/usr/bin/ghc-pkg recache %files %defattr(644,root,root,755) %doc %{name}-%{version}-doc/html -%{_libdir}/%{libsubdir} +%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf +%{_libdir}/%{ghcdir}/%{pkgname}-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -72,6 +72,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2010/08/27 20:29:24 baggins +- updated packaging to new template (ghc 6.12.3+) + Revision 1.2 2010/05/16 14:48:22 sparky - BR: gmp-devel ================================================================ Index: packages/ghc-utf8-string/ghc-utf8-string.spec diff -u packages/ghc-utf8-string/ghc-utf8-string.spec:1.2 packages/ghc-utf8-string/ghc-utf8-string.spec:1.3 --- packages/ghc-utf8-string/ghc-utf8-string.spec:1.2 Sat Apr 10 18:35:00 2010 +++ packages/ghc-utf8-string/ghc-utf8-string.spec Fri Aug 27 22:29:25 2010 @@ -9,11 +9,11 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz # Source0-md5: be8c5ef52a0824babdc89d60c1e9b600 URL: http://hackage.haskell.org/package/%{pkgname}/ -BuildRequires: ghc >= 6.10 +BuildRequires: ghc >= 6.12.3 %requires_eq ghc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define libsubdir ghc-%(/usr/bin/ghc --numeric-version)/%{pkgname}-%{version} +%define ghcdir ghc-%(/usr/bin/ghc --numeric-version) %description A UTF8 layer for IO and Strings. The utf8-string package @@ -28,7 +28,6 @@ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ - --libsubdir=%{libsubdir} \ --docdir=%{_docdir}/%{name}-%{version} ./Setup.lhs build @@ -36,6 +35,8 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d + ./Setup.lhs copy --destdir=$RPM_BUILD_ROOT # work around automatic haddock docs installation @@ -43,23 +44,22 @@ cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc ./Setup.lhs register \ - --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{libsubdir}/%{pkgname}.conf + --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf %clean rm -rf $RPM_BUILD_ROOT %post -/usr/bin/ghc-pkg update %{_libdir}/%{libsubdir}/%{pkgname}.conf +/usr/bin/ghc-pkg recache %postun -if [ "$1" = "0" ]; then - /usr/bin/ghc-pkg unregister %{pkgname}-%{version} -fi +/usr/bin/ghc-pkg recache %files %defattr(644,root,root,755) %doc %{name}-%{version}-doc/html -%{_libdir}/%{libsubdir} +%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf +%{_libdir}/%{ghcdir}/%{pkgname}-%{version} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -67,6 +67,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2010/08/27 20:29:25 baggins +- updated packaging to new template (ghc 6.12.3+) + Revision 1.2 2010/04/10 16:35:00 baggins - removed changelog entries from template ================================================================ Index: packages/ghc-zlib/ghc-zlib.spec diff -u packages/ghc-zlib/ghc-zlib.spec:1.2 packages/ghc-zlib/ghc-zlib.spec:1.3 --- packages/ghc-zlib/ghc-zlib.spec:1.2 Sat Apr 10 18:00:10 2010 +++ packages/ghc-zlib/ghc-zlib.spec Fri Aug 27 22:29:25 2010 @@ -9,11 +9,11 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz # Source0-md5: 19859e241dc18ef1501a5d44d8523507 URL: http://hackage.haskell.org/package/%{pkgname}/ -BuildRequires: ghc >= 6.10 +BuildRequires: ghc >= 6.12.3 %requires_eq ghc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define libsubdir ghc-%(/usr/bin/ghc --numeric-version)/%{pkgname}-%{version} +%define ghcdir ghc-%(/usr/bin/ghc --numeric-version) %description This package provides a pure interface for compressing and @@ -34,7 +34,6 @@ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ - --libsubdir=%{libsubdir} \ --docdir=%{_docdir}/%{name}-%{version} runhaskell Setup.hs build @@ -42,6 +41,8 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d + runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT # work around automatic haddock docs installation @@ -49,23 +50,22 @@ cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc runhaskell Setup.hs register \ - --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{libsubdir}/%{pkgname}.conf + --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf %clean rm -rf $RPM_BUILD_ROOT %post -/usr/bin/ghc-pkg update %{_libdir}/%{libsubdir}/%{pkgname}.conf +/usr/bin/ghc-pkg recache %postun -if [ "$1" = "0" ]; then - /usr/bin/ghc-pkg unregister %{pkgname}-%{version} -fi +/usr/bin/ghc-pkg recache %files %defattr(644,root,root,755) %doc %{name}-%{version}-doc/html <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-binary/ghc-binary.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-dataenc/ghc-dataenc.spec?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-hashed-storage/ghc-hashed-storage.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-haskeline/ghc-haskeline.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-mmap/ghc-mmap.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-terminfo/ghc-terminfo.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-utf8-string/ghc-utf8-string.spec?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-zlib/ghc-zlib.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
