diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 4cd35d1..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -monotone-0.41.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4449a32 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +monotone-0.45.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 659e999..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: monotone -# $Id$ -NAME := monotone -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) diff --git a/monotone-0.45-ls-output.patch b/monotone-0.45-ls-output.patch new file mode 100644 index 0000000..da03f38 --- /dev/null +++ b/monotone-0.45-ls-output.patch @@ -0,0 +1,9 @@ +============================================================ +--- tests/key_files_created_securely/__driver__.lua 63a9bd279770dc1fcefec5eb6cead7fd3e061982 ++++ tests/key_files_created_securely/__driver__.lua 2a0d5d0376174967369a15795f30a6e081af81b6 +@@ -25,4 +25,4 @@ check({ "ls", "-l", "keys/foobar." .. ke + keyid = string.sub(line, 0, 40) + + check({ "ls", "-l", "keys/foobar." .. keyid }, 0, true, nil) +-check(qgrep("^-rw------- .*keys/foobar." .. keyid, "stdout")) ++check(qgrep("^-rw-------[.+]? .*keys/foobar." .. keyid, "stdout")) diff --git a/monotone.spec b/monotone.spec index 00a9f0f..92ad616 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,5 +1,5 @@ Name: monotone -Version: 0.41 +Version: 0.45 Release: 1%{?dist} Summary: A free, distributed version control system @@ -11,23 +11,17 @@ Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz Source1: monotone.init Source2: monotone.sysconfig Source3: README.monotone-server +Patch0: monotone-0.45-ls-output.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel BuildRequires: boost-devel >= 1.33.1 -%if 1 -%define bundled_sqlite yes -%else -# In fact, monotone has a locally-hacked 3.2.7, so we can't replace it. -BuildRequires: sqlite-devel >= 3.2.7 -%define bundled_sqlite no -%endif -# monotone has local hacks in lua 5.0.2 as well, sigh. -%define bundled_lua 1 -%if %{bundled_lua} == 0 -BuildRequires: lua -%endif +BuildRequires: botan-devel >= 1.6.3 +BuildRequires: pcre-devel >= 7.4 +BuildRequires: sqlite-devel >= 3.3.8 +BuildRequires: lua-devel >= 5.1 +BuildRequires: libidn-devel # The test suite needs cvs. BuildRequires: cvs @@ -59,17 +53,28 @@ Group: Development/Tools %description server This package provides an easy-to-use standalone server setup for monotone. +%package -n perl-Monotone +Summary: Perl Module for monotone +Requires: monotone = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Group: Development/Tools + +%description -n perl-Monotone +This is a simple Perl module to start a monotone automate sub-process +and then pass commands to it. %prep %setup -q +%patch0 -p0 -b .ls-output %build %configure --with-bundled-lua=%{bundled_lua} \ - --with-bundled-sqlite=%{bundled_sqlite} + --with-bundled-sqlite=%{bundled_sqlite} make %{?_smp_mflags} %check -make %{?_smp_mflags} check || { cat tester_dir/*.log; false; } +# disable parallel runs in the testsuite for now +make check || { cat tester_dir/*.log; false; } %install rm -rf %{buildroot} @@ -92,7 +97,7 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_localstatedir}/lib ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server %{__install} -D -m 0555 %{SOURCE1} \ - %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone + %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone %{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/monotone %{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/monotone %{__install} -d -m 0750 %{buildroot}%{_sysconfdir}/monotone/private-keys @@ -101,17 +106,20 @@ ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server # These do not actually wind up in the package, due to %%ghost. %{__install} -c -m 0440 /dev/null \ - %{buildroot}%{_sysconfdir}/monotone/passphrase.lua + %{buildroot}%{_sysconfdir}/monotone/passphrase.lua %{__install} -c -m 0640 /dev/null \ - %{buildroot}%{_sysconfdir}/monotone/read-permissions + %{buildroot}%{_sysconfdir}/monotone/read-permissions %{__install} -c -m 0640 /dev/null \ - %{buildroot}%{_sysconfdir}/monotone/write-permissions + %{buildroot}%{_sysconfdir}/monotone/write-permissions %{__install} -c -m 0644 /dev/null \ - %{buildroot}%{_sysconfdir}/monotone/monotonerc + %{buildroot}%{_sysconfdir}/monotone/monotonerc touch %{buildroot}%{_localstatedir}/lib/monotone/server.mtn cp %{SOURCE3} . +%{__install} -D -m 0644 -p contrib/Monotone.pm \ + %{buildroot}%{perl_vendorlib}/Monotone.pm + %clean rm -f README.monotone-server rm -rf %{buildroot} @@ -119,13 +127,13 @@ rm -rf %{buildroot} %post if [ $1 -eq 1 ] then - /sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : + /sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : fi %preun if [ $1 -eq 0 ] then - /sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : + /sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : fi %files -f %{name}.lang @@ -139,13 +147,17 @@ fi %{_datadir}/emacs/site-lisp/monotone*.el* %{_sysconfdir}/bash_completion.d +%files -n perl-Monotone +%defattr(-,root,root,-) +%{perl_vendorlib}/Monotone.pm + %files server %defattr(-,root,root,-) %doc README.monotone-server %{_sbindir}/monotone-server %{_sysconfdir}/rc.d/init.d/monotone %dir %attr(0755,monotone,monotone) %{_localstatedir}/run/monotone -%config %{_sysconfdir}/sysconfig/monotone +%config(noreplace) %{_sysconfdir}/sysconfig/monotone %dir %attr(0755,root,monotone) %{_sysconfdir}/monotone %dir %attr(0750,root,monotone) %{_sysconfdir}/monotone/private-keys %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/monotonerc @@ -160,7 +172,7 @@ fi getent group monotone > /dev/null || groupadd -r monotone getent passwd monotone > /dev/null || useradd -r -g monotone -r -d %{_localstatedir}/lib/monotone -s /sbin/nologin \ - -c "Monotone Netsync Server" monotone + -c "Monotone Netsync Server" monotone exit 0 %post server @@ -169,18 +181,53 @@ exit 0 %preun server if [ $1 = 0 ]; then - /sbin/service monotone stop > /dev/null 2>&1 - /sbin/chkconfig --del monotone + /sbin/service monotone stop > /dev/null 2>&1 + /sbin/chkconfig --del monotone fi %postun if [ $1 -gt 1 ]; then - # Restart the running server: updates its db format when needed. - /sbin/service monotone condrestart > /dev/null 2>&1 || : + # Restart the running server: updates its db format when needed. + /sbin/service monotone condrestart > /dev/null 2>&1 || : fi %changelog +* Sat Sep 12 2009 Thomas Moschny - 0.45-1 +- Update to 0.45. + +* Sat Jul 25 2009 Fedora Release Engineering - 0.44-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed May 13 2009 Thomas Moschny - 0.44-1 +- Update to 0.44. + +* Sat Apr 25 2009 Thomas Moschny - 0.43-2 +- Rebuilt for new botan version. + +* Fri Mar 27 2009 Thomas Moschny - 0.43-1 +- Update to 0.43. +- Add BRs for libraries monotone doesn't bundle anylonger. +- Drop patches applied upstream. + +* Fri Feb 27 2009 Thomas Moschny - 0.42-5 +- Add one more netsync related patch from trunk. + +* Wed Feb 25 2009 Fedora Release Engineering - 0.42-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 9 2009 Thomas Moschny - 0.42-3 +- Disable %%{_smp_mflags} in the testsuite, causes strange errors. +- Fix two issues with gcc44. +- Add patch from upstream fixing netsync printing an error message of + the form "peer [...] IO failed in confirmed state (success)". + +* Fri Jan 2 2009 Thomas Moschny - 0.42-2 +- Pack Monotone.pm (in a subpackage). (#450267) + +* Fri Jan 2 2009 Thomas Moschny - 0.42-1 +- Updated for 0.42 release. + * Fri Sep 12 2008 Thomas Moschny - 0.41-1 - Updated for 0.41 release. - Added mtnopt helper. diff --git a/sources b/sources index 662e6a3..647a075 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4ee37fb6853719933561fef901e2a07 monotone-0.41.tar.gz +bd37c3d75e3fd1974a17f556499b42ab monotone-0.45.tar.gz