rpms/darcs/devel .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 (petersen)]

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3709

Modified Files:
	.cvsignore darcs.spec sources 
Removed Files:
	darcs-error_xml-missing.patch darcs-ghc-6_8-compat.patch 
Log Message:
- 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/.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	23 Jun 2008 02:57:06 -0000	1.10
@@ -1 +1 @@
-darcs-1.0.9.tar.gz
+darcs-2.0.0.tar.gz


Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/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	23 Jun 2008 02:57:06 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           darcs
-Version:        1.0.9
-Release:        11%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -19,10 +19,6 @@
 # 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
-
 %description
 Darcs is a revision control system, along the lines of CVS
 or arch. That means that it keeps track of various revisions
@@ -56,11 +52,17 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
 # skip test currently failing in buildsystem
 mv tests/send.sh{,-disabled}
 
+# convert text files to utf-8
+for textfile in tools/zsh_completion_new AUTHORS
+do
+    mv $textfile $textfile.old
+    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
+    rm -f $textfile.old
+done 
+
 
 %build
 # the patch above patches aclocal.m4 and configure.ac 
@@ -69,25 +71,15 @@
 %configure --libexecdir=%{_localstatedir}/www
 make all
 
+
 %check
-make test_unit
-#make check
+#make test_unit
+##make check
 
 
 %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
-do
-    mv $textfile $textfile.old
-    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
-    rm -f $textfile.old
-done 
+make DESTDIR=$RPM_BUILD_ROOT installbin installserver doc/index.html
 
 
 %clean
@@ -101,9 +93,10 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog manual bash_completion zsh_completion_*
+%doc AUTHORS COPYING ChangeLog doc tools/zsh_completion_*
 %{_bindir}/darcs
 %{_mandir}/man1/*
+%{_sysconfdir}/bash_completion.d/darcs
 
 
 %files server
@@ -115,6 +108,14 @@
 
 
 %changelog
+* 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/devel/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	23 Jun 2008 02:57:06 -0000	1.10
@@ -1 +1 @@
-07222cd3c500aa31e3332847573a4ab2  darcs-1.0.9.tar.gz
+89e48c2fb388692b78b3cceeb86a95a7  darcs-2.0.0.tar.gz


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


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