rpms/darcs/F-9 .cvsignore, 1.9, 1.10 darcs.spec, 1.34, 1.35 sources, 1.9, 1.10 darcs-error_xml-missing.patch, 1.1, NONE darcs-ghc-6_8-compat.patch, 1.1, NONE

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/darcs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25862

Modified Files:
	.cvsignore darcs.spec sources 
Removed Files:
	darcs-error_xml-missing.patch darcs-ghc-6_8-compat.patch 
Log Message:
backport latest 2.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/darcs/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Jun 2007 03:23:54 -0000	1.9
+++ .cvsignore	21 Jan 2009 07:05:33 -0000	1.10
@@ -1 +1 @@
-darcs-1.0.9.tar.gz
+darcs-2.2.0.tar.gz


Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/F-9/darcs.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- darcs.spec	19 Feb 2008 06:16:57 -0000	1.34
+++ darcs.spec	21 Jan 2009 07:05:33 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           darcs
-Version:        1.0.9
-Release:        11%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -12,16 +12,12 @@
 BuildRequires:  autoconf, ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel
 # for make check
 BuildRequires:  which
-# need chcon
-Requires(post): coreutils
+# for building the manual
+BuildRequires: latex2html
+Requires(post): policycoreutils
 
-# see http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=246051
-# see http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=396501
-ExcludeArch:    alpha ppc64 
-
-# allows darcs to be compiled by GHC 6.8
-Patch0:         darcs-ghc-6_8-compat.patch
-Patch1:         darcs-error_xml-missing.patch
+# we have only bootstrapped ghc on the following archs:
+ExclusiveArch:	i386 x86_64 ppc
 
 %description
 Darcs is a revision control system, along the lines of CVS
@@ -34,11 +30,28 @@
 fully functional branch, and 2) underlying darcs is a
 consistent and powerful theory of patches.
 
+%package doc
+Summary: David's advanced revision control system Server
+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, /usr/bin/xsltproc
+Requires: webserver, darcs, libxslt
 
 %description server
 Darcs is a revision control system, along the lines of CVS
@@ -55,39 +68,28 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-# skip test currently failing in buildsystem
-mv tests/send.sh{,-disabled}
+%setup -q
 
 
 %build
-# the patch above patches aclocal.m4 and configure.ac 
-# therefore autoconf must be rerun
-%{__autoconf}
 %configure --libexecdir=%{_localstatedir}/www
 make all
 
+
 %check
-make test_unit
-#make check
+make test
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT installbin installserver manual/index.html
-
-cp darcs_completion bash_completion
-rm -r %buildroot%{_sysconfdir}/bash_completion.d
-
 # convert text files to utf-8
-for textfile in zsh_completion_new AUTHORS
+for textfile in tools/zsh_completion_new AUTHORS
 do
-    mv $textfile $textfile.old
+    mv -v $textfile $textfile.old
     iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
-    rm -f $textfile.old
+    rm -fv $textfile.old
 done 
+make DESTDIR=$RPM_BUILD_ROOT install installserver install-html
 
 
 %clean
@@ -95,17 +97,23 @@
 
 
 %post
-semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1 || :
-restorecon -v %{_bindir}/darcs
+semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/%{name} >/dev/null 2>&1
+restorecon %{_bindir}/%{name}
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog manual bash_completion zsh_completion_*
+%doc AUTHORS COPYING ChangeLog tools/zsh_completion_*
+%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 ChangeLog
@@ -115,6 +123,37 @@
 
 
 %changelog
+* Fri Jan 16 2009 Jens Petersen <petersen at redhat.com> - 2.2.0-1
+- update to 2.2.0
+- update install targets
+
+* Wed Dec 10 2008 Jens Petersen <petersen at redhat.com> - 2.1.2-1
+- update to 2.1.2
+
+* Tue Nov 11 2008 Jens Petersen <petersen at redhat.com> - 2.1.1-0.1.rc2
+- update to 2.1.1rc2 which builds with ghc-6.10.1
+- try to run all tests again
+
+* Mon Sep 22 2008 Jens Petersen <petersen at redhat.com> - 2.0.2-3
+- revert last change and require policycoreutils for post (mtasaka, #462221)
+
+* Fri Sep 19 2008 Jens Petersen <petersen at redhat.com> - 2.0.2-2
+- use full paths to selinux tools in %%post (Jon Stanley, #462221)
+
+* Sat Jun 28 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 2.0.2-1
+- split out the manual to a -doc rpm
+- update to 2.0.2
+- switch to make test
+- remove skipping of tests - it doesn't appear to apply anymore
+
+* Mon Jun 23 2008 Jens Petersen <petersen at redhat.com> - 2.0.0-1.fc10
+- update to 2.0.0
+- no longer require darcs-ghc-6_8-compat.patch and darcs-error_xml-missing.patch
+- move utf-8 conversion to prep
+- disable check for now
+- manual is now doc and shell completion config lives in tools
+- install bash completion
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.9-11
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/darcs/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Jun 2007 03:23:54 -0000	1.9
+++ sources	21 Jan 2009 07:05:33 -0000	1.10
@@ -1 +1 @@
-07222cd3c500aa31e3332847573a4ab2  darcs-1.0.9.tar.gz
+8f0a5eba5971e7cf324c63664cde59e2  darcs-2.2.0.tar.gz


--- darcs-error_xml-missing.patch DELETED ---


--- darcs-ghc-6_8-compat.patch DELETED ---