dist-git conversion

#2781)

.cvsignore

@@ -1,2 +0,0 @@
-ghc-6.8.0.20070928-src-extralibs.tar.bz2
-ghc-6.8.0.20070928-src.tar.bz2

.gitignore

@@ -0,0 +1,2 @@
+ghc-6.8.2-src-extralibs.tar.bz2
+ghc-6.8.2-src.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ghc
-# $Id$
-NAME := ghc
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ghc.spec

@@ -1,4 +1,4 @@
-%define ghcver ghc680
+%define ghcver ghc682
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
@@ -17,12 +17,12 @@
 %define package_debugging 0
 
 Name:		ghc
-Version:	6.8.0.20070928
-Release:	2%{?dist}
+Version:	6.8.2
+Release:	8%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
-ExcludeArch:	ppc64
-License:	BSD style
+ExcludeArch:	alpha ppc64
+License:	BSD
 Group:		Development/Languages
 Source0:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
 Source1:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
@@ -37,7 +37,8 @@ BuildRequires:  freeglut-devel, openal-devel
 # haddock generates docs in libraries
 BuildRequires: libxslt, docbook-style-xsl, haddock >= 0.8
 %endif
-Prefix:		%{_prefix}
+# Work around http://hackage.haskell.org/trac/ghc/ticket/2020
+BuildRequires:  autoconf, automake
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -82,7 +83,7 @@ needed.
 %package doc
 Summary:	Documentation for GHC
 Group:		Development/Languages
-Requires:	%{name}
+Requires:	%{name} = %{version}-%{release}
 
 %description doc
 Preformatted documentation for the Glorious Glasgow Haskell
@@ -110,11 +111,17 @@ echo "GhcLibWays=" >> mk/build.mk
 echo "GhcRTSWays=thr debug" >> mk/build.mk
 %endif
 
+# Work around http://hackage.haskell.org/trac/ghc/ticket/2020
+for c in configure libraries/*/configure; do
+  (cd `dirname $c` && autoreconf)
+done
+
 ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
   --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
   --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
   --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
-  --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir}
+  --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
+  --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{_docdir}/%{name}-%{version}
 
 # drop truncated copy of header (#222865)
 rm libraries/network/include/Typeable.h
@@ -148,6 +155,10 @@ rm -f rpm-*-filelist rpm-*.files
 # make paths absolute (filter "./usr" to "/usr")
 sed -i -e "s|\.%{_prefix}|%{_prefix}|" rpm-*.files
 
+# fix haddock directories
+sed -i -e 's,%{_docdir}/%{name}/,%{_docdir}/%{name}-%{version}/,g' \
+  ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/package.conf
+
 cat rpm-dir.files rpm-lib.files > rpm-base-filelist
 %if %{build_prof}
 cat rpm-dir.files rpm-prof.files > rpm-prof-filelist
@@ -163,12 +174,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-## tweak prefix in drivers scripts if relocating
-if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then
-  BINDIR=`echo %{_bindir} | sed -e "s|%{_prefix}|${RPM_INSTALL_PREFIX}|"`
-  sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/{ghcprof,hsc2hs}
-fi
-
 /usr/bin/chcon -t unconfined_execmem_exec_t %{_bindir}/{hasktags,runghc,runhaskell} >/dev/null 2>&1 || :
 
 # Alas, GHC, Hugs, and nhc all come with different set of tools in
@@ -189,13 +194,6 @@ update-alternatives --install %{_bindir}/hsc2hs hsc2hs \
   %{_bindir}/hsc2hs-ghc 500
 
 %post -n %{ghcver}
-## tweak prefix in drivers scripts if relocating
-if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then
-  BINDIR=`echo %{_bindir} | sed -e "s|%{_prefix}|${RPM_INSTALL_PREFIX}|"`
-  LIBDIR=`echo %{_libdir} | sed -e "s|%{_prefix}|${RPM_INSTALL_PREFIX}|"`
-  sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/ghc*-%{version} ${LIBDIR}/ghc-%{version}/package.conf
-fi
-
 /usr/bin/chcon -t unconfined_execmem_exec_t %{_libdir}/ghc-%{version}/{ghc-%{version},ghc-pkg.bin,hsc2hs-bin} >/dev/null 2>&1 || :
 
 
@@ -235,6 +233,24 @@ fi
 
 
 %changelog
+* Sun Jan 06 2008 Bryan O'Sullivan <bos@serpentine.com> - 6.8.2-7
+- More attempts to fix docdir
+
+* Sun Jan 06 2008 Bryan O'Sullivan <bos@serpentine.com> - 6.8.2-6
+- Fix docdir
+
+* Tue Dec 12 2007 Bryan O'Sullivan <bos@serpentine.com> - 6.8.2-1
+- Update to 6.8.2
+
+* Fri Nov 23 2007 Bryan O'Sullivan <bos@serpentine.com> - 6.8.1-2
+- Exclude alpha
+
+* Thu Nov  8 2007 Bryan O'Sullivan <bos@serpentine.com> - 6.8.1-2
+- Drop bit-rotted attempts at making package relocatable
+
+* Sun Nov  4 2007 Michel Salim <michel.sylvan@gmail.com> - 6.8.1-1
+- Update to 6.8.1
+
 * Sat Sep 29 2007 Bryan O'Sullivan <bos@serpentine.com> - 6.8.0.20070928-2
 - add happy to BuildRequires
 

sources

@@ -1,2 +1,2 @@
-8699ec00c510077ad6c632aea19ec1e0  ghc-6.8.0.20070928-src-extralibs.tar.bz2
-2f3d20ad0c68cd77a06b708e4d8360c5  ghc-6.8.0.20070928-src.tar.bz2
+d199c50814188fb77355d41058b8613c  ghc-6.8.2-src-extralibs.tar.bz2
+43108417594be7eba0918c459e871e40  ghc-6.8.2-src.tar.bz2