[darcs/el6/master] update to 2.4.4 from F14

Tue Oct 5 03:24:32 UTC 2010

commit bd50634e074bd6a24e001c5c9267f8b569d5b3b2
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Oct 5 13:24:35 2010 +1000

    update to 2.4.4 from F14

 .gitignore |    2 +-
 darcs.spec |  172 ++++++++++++++++++++++++++++++++----------------------------
 sources    |    2 +-
 3 files changed, 94 insertions(+), 82 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 2faa119..1db622e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-darcs-2.2.1.tar.gz
+darcs-2.4.4.tar.gz
diff --git a/darcs.spec b/darcs.spec
index 72b7c27..bc6e674 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -1,68 +1,55 @@
-Name:           darcs
-Version:        2.2.1
-Release:        5%{?dist}
+# Updated to cabal2spec-0.22.2 and ghc-rpm-macros-0.8.1
+
+%global pkg_name darcs
+
+%global common_summary Haskell %{pkg_name} library
+
+%global common_description Darcs is a revision control system, along the lines of CVS\
+or arch. That means that it keeps track of various revisions\
+and branches of your project, allows for changes to\
+propagate from one branch to another. Darcs is intended to\
+be an ``advanced'' revision control system. Darcs has two\
+particularly distinctive features which differ from other\
+revision control systems: 1) each copy of the source is a\
+fully functional branch, and 2) underlying darcs is a\
+consistent and powerful theory of patches.
+
+# Haskell library dependencies:
+%global ghc_pkg_deps ghc-hashed-storage-devel, ghc-haskeline-devel, ghc-html-devel, ghc-parsec-devel, ghc-regex-compat-devel, ghc-zlib-devel
+
+%global ghc_pkg_c_deps curl-devel
+
+%bcond_without shared
+%bcond_without hscolour
+
+# debuginfo is not useful for ghc
+%global debug_package %{nil}
+
+Name:           %{pkg_name}
+Version:        2.4.4
+Release:        3%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.darcs.net/
-Source0:        http://www.darcs.net/%{name}-%{version}.tar.gz
+Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:	%{ix86} x86_64 ppc alpha
-BuildRequires:  ghc
-BuildRequires:  autoconf, sendmail, curl-devel, ncurses-devel, zlib-devel
+Obsoletes:      darcs-server < 2.2.1-6
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.8.1
+%if %{with hscolour}
+BuildRequires:  hscolour
+%endif
+%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 # for make check
 BuildRequires:  which
-# for building the manual
-BuildRequires: latex2html
 
 %description
-Darcs is a revision control system, along the lines of CVS
-or arch. That means that it keeps track of various revisions
-and branches of your project, allows for changes to
-propagate from one branch to another. Darcs is intended to
-be an ``advanced'' revision control system. Darcs has two
-particularly distinctive features which differ from other
-revision control systems: 1) each copy of the source is a
-fully functional branch, and 2) underlying darcs is a
-consistent and powerful theory of patches.
-
-%package doc
-Summary: Documentation for David's advanced revision control system
-Group: Documentation
-
-%description doc
-Darcs is a revision control system, along the lines of CVS
-or arch. That means that it keeps track of various revisions
-and branches of your project, allows for changes to
-propagate from one branch to another. Darcs is intended to
-be an ``advanced'' revision control system. Darcs has two
-particularly distinctive features which differ from other
-revision control systems: 1) each copy of the source is a
-fully functional branch, and 2) underlying darcs is a
-consistent and powerful theory of patches.
-
-This package contains the darcs manual.
-
-
-%package server
-Summary: David's advanced revision control system Server
-Group: Development/Tools
-Requires: webserver, darcs, libxslt
-
-%description server
-Darcs is a revision control system, along the lines of CVS
-or arch. That means that it keeps track of various revisions
-and branches of your project, allows for changes to
-propagate from one branch to another. Darcs is intended to
-be an ``advanced'' revision control system. Darcs has two
-particularly distinctive features which differ from other
-revision control systems: 1) each copy of the source is a
-fully functional branch, and 2) underlying darcs is a
-consistent and powerful theory of patches.
-
-This package contains the darcs cgi server program.
+%{common_description}
 
 
 %prep
@@ -70,54 +57,79 @@ This package contains the darcs cgi server program.
 
 
 %build
-#%%{__autoconf}
-%configure --libexecdir=%{_localstatedir}/www
-make all
+%ghc_lib_build
 
 
 %check
-make test
+%cabal test
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# convert text files to utf-8
-for textfile in tools/zsh_completion_new AUTHORS
-do
-    mv -v $textfile $textfile.old
-    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
-    rm -fv $textfile.old
-done 
-make DESTDIR=$RPM_BUILD_ROOT install installserver install-html
+%ghc_lib_install
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+cp -p contrib/darcs_completion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/darcs
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%ghc_binlib_package -o 2.4.4-4
+
+
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING tools/zsh_completion_*
+%doc COPYING NEWS contrib/_darcs.zsh
 %dir %{_sysconfdir}/bash_completion.d
 %config(noreplace) %{_sysconfdir}/bash_completion.d/darcs
 %{_bindir}/darcs
-%{_mandir}/man1/*
-
-
-%files doc
-%defattr(-,root,root,-)
-%{_docdir}/darcs
-
-
-%files server
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS
-%{_localstatedir}/www/cgi-bin
-%config(noreplace) %{_sysconfdir}/darcs
-%{_datadir}/darcs
+# workaround Cabal-1.8 bug (http://hackage.haskell.org/trac/hackage/ticket/641)
+%attr(644,root,root) %{_mandir}/man1/darcs.1*
 
 
 %changelog
+* Mon Jul 19 2010 Jens Petersen <petersen at redhat.com> - 2.4.4-3
+- rebuild for newer regex-compat from haskell-platform-2010.2.0.0
+- update to cabal2spec-0.22.1:
+  - bcond for hscolour
+  - add doc obsoletes version
+
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 2.4.4-2
+- sync cabal2spec-0.22.1
+
+* Thu Jun  3 2010 Jens Petersen <petersen at redhat.com> - 2.4.4-1
+- update to 2.4.4
+
+* Tue May 18 2010 Jens Petersen <petersen at redhat.com> - 2.4.3-1
+- update to 2.4.3
+
+* Thu Apr 29 2010 Jens Petersen <petersen at redhat.com> - 2.4.1-2
+- rebuild against ghc-6.12.2
+
+* Wed Apr 14 2010 Jens Petersen <petersen at redhat.com> - 2.4.1-1
+- update to 2.4.1 bugfix release
+- darcs-2.4-issue458.sh-attr.patch was upstreamed
+
+* Fri Mar  5 2010 Jens Petersen <petersen at redhat.com> - 2.4-3
+- make manpage attr 0644 to workaround Cabal bug (#570110)
+
+* Fri Mar  5 2010 Jens Petersen <petersen at redhat.com> - 2.4-2
+- obsolete darcs-server
+
+* Mon Mar  1 2010 Jens Petersen <petersen at redhat.com> - 2.4-1
+- new major upstream version 2.4
+- darcs is now officially a cabal binlib package
+- package with ghc-rpm-macros
+- no longer BR autoconf, sendmail, ncurses-devel, zlib-devel
+- add haskell deps: hashed-storage, haskeline, html, parsec, regex-compat, zlib
+- server (subpackage) is gone
+- add darcs-2.4-issue458.sh-attr.patch to workaround selinux output
+- run check tests again
+- replace AUTHORS with NEWS
+- zsh completion filename changed
+
 * Sun Sep 13 2009 Jens Petersen <petersen at redhat.com> - 2.2.1-5
 - rebuild against ghc-6.10.4 which should fix --help hangs
 - improve doc summary (#522899)
diff --git a/sources b/sources
index de863f1..9bb1017 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9255b501b8e71762f6a0c840594a546  darcs-2.2.1.tar.gz
+1ccd97561e4e0592b44f1989cebeca02  darcs-2.4.4.tar.gz
