rpms/haddock/FC-6 haddock.spec,1.4,1.5 sources,1.2,1.3

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/haddock/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18516

Modified Files:
	haddock.spec sources 
Log Message:
sync with devel:
- update to 0.8
- use new cabal build system
- update file list
- buildrequire autoconf



Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/FC-6/haddock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- haddock.spec	28 Sep 2006 01:26:09 -0000	1.4
+++ haddock.spec	9 Nov 2006 02:50:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           haddock
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        Haddock documentation tool for annotated Haskell source code
 
 Group:          Development/Tools
@@ -9,7 +9,7 @@
 Source0:        http://www.haskell.org/haddock/%{name}-%{version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ghc libxslt docbook-style-xsl
+BuildRequires:  ghc libxslt docbook-style-xsl autoconf
 # need chcon
 PreReq:		coreutils
 
@@ -32,24 +32,17 @@
 
 
 %build
-./configure --prefix=%{_prefix} --libdir=%{_libdir}
-make %{?_smp_mflags}
-(cd haddock/doc ; make html )
+runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir}
+runhaskell Setup.lhs build
+cd doc
+test -f configure || autoreconf
+./configure
+make html
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-
-# move datafiles into their expected location
-mkdir ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}
-find ${RPM_BUILD_ROOT}%{_datadir} -type f | xargs mv --target-directory=${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}
-
-sed -i -e "s!%{_libdir}/%{name}-%{version}!%{_libexecdir}!" ${RPM_BUILD_ROOT}%{_bindir}/%{name}-%{version}
-
-# drop versioned binary wrapper
-rm ${RPM_BUILD_ROOT}%{_bindir}/%{name}
-mv ${RPM_BUILD_ROOT}%{_bindir}/%{name}{-%{version},}
+runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}
 
 
 %clean
@@ -62,14 +55,19 @@
 
 %files
 %defattr(-,root,root)
-%doc haddock/README
-%doc haddock/doc/haddock
+%doc README
+%doc doc/haddock/*
 %{_bindir}/haddock
-%{_libexecdir}/haddock.bin
 %{_datadir}/haddock-%{version}
 
 
 %changelog
+* Fri Nov  3 2006 Jens Petersen <petersen at redhat.com> - 0.8-1
+- update to 0.8
+- use new cabal build system
+- update file list
+- buildrequire autoconf
+
 * Thu Sep 28 2006 Jens Petersen <petersen at redhat.com> - 0.7-4
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/haddock/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Sep 2005 03:00:15 -0000	1.2
+++ sources	9 Nov 2006 02:50:45 -0000	1.3
@@ -1 +1 @@
-759419e78416d5f093190968a4dc18f5  haddock-0.7-src.tar.gz
+0a1bb64e7642f64d2560dc258c570c1d  haddock-0.8-src.tar.gz