From 36b5010e16477653abdfd6ec98ab969f947bdd7e3d0f356de0c76a56c8f2d1c9 Mon Sep 17 00:00:00 2001 From: Herbert Graeber Date: Mon, 18 Aug 2008 20:55:28 +0000 Subject: [PATCH] update to version 6.8.3 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=52 --- ghc-6.8.2-src-extralibs.tar.bz2 | 3 - ghc-6.8.2-src.tar.bz2 | 3 - ghc-6.8.3-src-extralibs.tar.bz2 | 3 + ghc-6.8.3-src.tar.bz2 | 3 + ghc.spec | 108 ++++++++++++++++++++++---------- rpmlintrc | 4 ++ 6 files changed, 84 insertions(+), 40 deletions(-) delete mode 100644 ghc-6.8.2-src-extralibs.tar.bz2 delete mode 100644 ghc-6.8.2-src.tar.bz2 create mode 100644 ghc-6.8.3-src-extralibs.tar.bz2 create mode 100644 ghc-6.8.3-src.tar.bz2 create mode 100644 rpmlintrc diff --git a/ghc-6.8.2-src-extralibs.tar.bz2 b/ghc-6.8.2-src-extralibs.tar.bz2 deleted file mode 100644 index 44aa1a3..0000000 --- a/ghc-6.8.2-src-extralibs.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96cdd5694907b22d3ecd7988d04e0105e50a8096d5662b21b6acaf79ffba9510 -size 1919843 diff --git a/ghc-6.8.2-src.tar.bz2 b/ghc-6.8.2-src.tar.bz2 deleted file mode 100644 index c4de6ba..0000000 --- a/ghc-6.8.2-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d10f973c35e8d7d9f62b53e26fef90177a9a15105cda4b917340ba7696a22d9 -size 7072545 diff --git a/ghc-6.8.3-src-extralibs.tar.bz2 b/ghc-6.8.3-src-extralibs.tar.bz2 new file mode 100644 index 0000000..47d43ba --- /dev/null +++ b/ghc-6.8.3-src-extralibs.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee2f5ba6a46157fc53eae515cb6fa1ed3c5023e7eac15981d92af0af00ee2ba2 +size 1912647 diff --git a/ghc-6.8.3-src.tar.bz2 b/ghc-6.8.3-src.tar.bz2 new file mode 100644 index 0000000..846d6f6 --- /dev/null +++ b/ghc-6.8.3-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fc1ff82a555532f1c9d2dc628fd9de5e6ebab2ce6ee9490a34174ceb6f76e6b +size 7092076 diff --git a/ghc.spec b/ghc.spec index 36ebbc7..3996706 100644 --- a/ghc.spec +++ b/ghc.spec @@ -7,33 +7,61 @@ # norootforbuild Name: ghc -Version: 6.8.2 +Version: 6.8.3 Release: 0 Summary: The Glasgow Haskell Compilation system Summary(de): Das Glasgow-Haskell-Compilation-System License: BSD style w/o adv. clause Group: Development/Languages/Haskell -Packager: Herbert Graeber Source0: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2 Source1: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src-extralibs.tar.bz2 Patch0: ghc-optional-openal.patch URL: http://haskell.org/ghc/ -%if 0%{?suse_version} > 1000 +Provides: ghc-array = 0.1.0.0 +Provides: ghc-filepath = 1.1.0.0 +Provides: ghc-network = 2.2.0.0 +Provides: ghc-process = 1.0.0.1 +Provides: ghc-template-haskell = 2.2.0.0 +Provides: ghc-base = 3.0.2.0 +Provides: ghc-GLUT = 2.1.1.2 +Provides: ghc-old-locale = 1.0.0.0 +Provides: ghc-QuickCheck = 1.1.0.0 +Provides: ghc-time = 1.1.2.1 +Provides: ghc-bytestring = 0.9.0.1.1 +Provides: ghc-haskell98 = 1.0.1.0 +Provides: ghc-old-time = 1.0.0.0 +Provides: ghc-random = 1.0.0.0 +Provides: ghc-unix = 2.3.0.1 +Provides: ghc-Cabal = 1.2.4.0 +Provides: ghc-haskell-src = 1.0.1.2 +Provides: ghc-OpenGL = 2.2.1.1 +Provides: ghc-readline = 1.0.1.0 +Provides: ghc-xhtml = 3000.2.0.0 +Provides: ghc-cgi = 3001.1.6.0 +Provides: ghc-hpc = 0.5.0.1 +Provides: ghc-packedstring = 0.1.0.0 +Provides: ghc-regex-base = 0.72.0.1 +Provides: ghc-containers = 0.1.0.2 +Provides: ghc-html = 1.0.1.1 +Provides: ghc-parallel = 1.0.0.1 +Provides: ghc-regex-compat = 0.71.0.1 +Provides: ghc-directory = 1.0.0.1 +Provides: ghc-HUnit = 1.2.0.0 +Provides: ghc-parsec = 2.1.0.1 +Provides: ghc-regex-posix = 0.72.0.2 +Provides: ghc-fgl = 5.4.2.0 +Provides: ghc-mtl = 1.1.0.1 +Provides: ghc-pretty = 1.0.0.0 +Provides: ghc-stm = 2.1.1.1 +PreReq: update-alternatives Requires: gmp-devel -%endif +Requires: readline-devel Requires: update-alternatives -%if 0%{?suse_version} >= 1030 -Requires: licenses -%endif BuildRequires: ghc >= 5.0 BuildRequires: happy >= 1.15 BuildRequires: alex >= 2.0 BuildRequires: ncurses-devel -%if 0%{?suse_version} > 1000 BuildRequires: gmp-devel -%else -BuildRequires: gmp -%endif BuildRequires: readline-devel BuildRequires: xorg-x11-Mesa-devel BuildRequires: freeglut-devel @@ -52,24 +80,23 @@ BuildRequires: openal BuildRequires: freealut %endif BuildRequires: update-alternatives -%if 0%{?suse_version} >= 1010 -%if 0%{?suse_version} <= 1030 BuildRequires: java-1_5_0-sun -%endif BuildRequires: fop -%endif BuildRequires: xmltex %if 0%{?suse_version} <= 1010 BuildRequires: libpng %endif -%if 0%{?suse_version} >= 1030 -BuildRequires: licenses +%if 0%{?suse_version} > 1020 +BuildRequires: fdupes %endif Provides: haskell_compiler -BuildRoot: /var/tmp/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: /usr +# return use inversed values for booleans (= 0: true, !=0: false) +%define check_haddock_ghc %(test `haddock --ghc-version` != %version; echo $?) + %description Haskell is the standard purely functional programming language; the current language version is Haskell 98, agreed in December 1998. @@ -111,6 +138,7 @@ the documentation is available online at http://haskell.org/ghc/documentation.html + # the debuginfo subpackage is currently empty anyway, so don't generate it %define debug_package %{nil} %define __spec_install_post /usr/lib/rpm/brp-compress @@ -143,34 +171,29 @@ echo "NO_INSTALL_RUNHASKELL=YES" >>mk/build.mk #echo "NO_INSTALL_HSC2HS=YES" >>mk/build.mk cat <<"EOF" >>mk/build.mk -docdir := %{_docdir}/%{name}-%{version} +docdir := %{_docdir}/%{name}-doc htmldir := $(docdir) dvidir := $(docdir) pdfdir := $(docdir) psdir := $(docdir) EOF -make %{?jobs:-j%jobs} all +make %{?jobs:-j%jobs} all datadir="${_docdir}/%{name}-doc" +%if %check_haddock_ghc make %{?jobs:-j%jobs} html make %{?jobs:-j%jobs} -C libraries HADDOCK_DOCS=YES ( cd libraries/Cabal && docbook2html doc/Cabal.xml --output doc/Cabal ) -%if 0%{?suse_version} >= 1010 -make %{?jobs:-j%jobs} -C docs/ext-core ps make -C docs/storage-mgt ps %endif %install -%if 0%{?suse_version} >= 1030 -for FILE in LICENSE ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi -done -%endif -make DESTDIR=%{buildroot} docdir=%{_datadir}/doc/packages/%{name} HADDOCK_DOCS=YES install install-docs +%if %check_haddock_ghc +make DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-doc HADDOCK_DOCS=YES install install-docs mkdir html-docs -cp -a %{buildroot}%{_datadir}/doc/packages/%{name}/{index.html,libraries} html-docs +cp -a %{buildroot}%{_docdir}/%{name}-doc/{index.html,libraries} html-docs +%else +make DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-doc install +%endif #mv %{buildroot}%{_prefix}/bin/hsc2hs %{buildroot}%{_prefix}/bin/hsc2hs-ghc dir=`pwd` @@ -182,6 +205,10 @@ find $libdir ! -type d \( -name '*.p_hi' -or -name '*_p.a' \) -print | \ sed 's|^|/|' > $dir/rpm-prof-lib-files popd +%if 0%{?suse_version} > 1020 +%fdupes $RPM_BUILD_ROOT +%endif + %post update-alternatives --install %{_bindir}/runhaskell runhaskell \ %{_bindir}/runghc 500 @@ -214,26 +241,39 @@ fi %{_bindir}/hsc2hs-ghc %{_bindir}/hsc2hs-ghc-%{version} %{_bindir}/runghc +%if %check_haddock_ghc %{_mandir}/man1/ghc.1* +%endif %files prof -f rpm-prof-lib-files %defattr(-,root,root) %files doc %defattr(-,root,root) +%if %check_haddock_ghc %doc docs/comm %doc docs/docbook-cheat-sheet/docbook-cheat-sheet %doc docs/users_guide/users_guide %doc libraries/Cabal/doc/Cabal %doc html-docs/* -%if 0%{?suse_version} >= 1010 -%doc docs/ext-core/core.ps %doc docs/storage-mgt/ldv.ps %doc docs/storage-mgt/rp.ps %doc docs/storage-mgt/sm.ps %endif %changelog +* Mon Aug 18 2008 Herbert Graeber 6.8.3 +- add provides for all libraries included +- create a doc package even when docs cannot be created +- remove support for SUSE Linux 10.0 and below +- add requirement for readline-devel +- do not build docs for ext-core for now +- suppress some messages from rpmlint +- no man page without docs +- build docs only if the ghc version haddock has built with matches the ghc to build +- fix ghc-pks doc location +- update to version 6.8.3 + * Fri Mar 04 2008 Herbert Graeber - ghc cannot use different host and target platforms (i686 and i586) diff --git a/rpmlintrc b/rpmlintrc new file mode 100644 index 0000000..4e74026 --- /dev/null +++ b/rpmlintrc @@ -0,0 +1,4 @@ +addFilter("devel-dependency gmp-devel") +addFilter("devel-file-in-non-devel-package") +addFilter("static-library-without-debuginfo") +