[monotone] - Update to 0.99. - Remove patch already applied upstream. - Add patch for monotone bug #100. - Incl

Fri Oct 29 14:42:58 UTC 2010

commit 602161c5a69fc74f700d0d5463ab4a39cff589f4
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Fri Oct 29 16:42:35 2010 +0200

    - Update to 0.99.
    - Remove patch already applied upstream.
    - Add patch for monotone bug #100.
    - Include the monotone manpage in the package.
    - Specfile cleanups.

 .gitignore                  |    1 +
 monotone-0.99-bug-100.patch |   11 +++++
 monotone-sqlite-3.7.3.patch |   48 -------------------
 monotone.spec               |  105 +++++++++++++++++++++++++-----------------
 sources                     |    2 +-
 5 files changed, 75 insertions(+), 92 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index cf0d8d6..1f0c783 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 monotone-0.48.tar.gz
 /monotone-0.48.1.tar.gz
+/monotone-0.99.tar.gz
diff --git a/monotone-0.99-bug-100.patch b/monotone-0.99-bug-100.patch
new file mode 100644
index 0000000..11aa9d9
--- /dev/null
+++ b/monotone-0.99-bug-100.patch
@@ -0,0 +1,11 @@
+--- pcrewrap.cc	08ac10d9a75557faba316d1b0a242b8ed3cd4243
++++ pcrewrap.cc	42611610af4de2f7d1da39bf5c023038b7590be7
+@@ -144,7 +144,7 @@ namespace pcre
+     // because pcre_exec might not signal trailing unmatched subpatterns
+     // i.e. if "abc" matches "(abc)(de)?", the match count is two, not
+     // the expected three
+-    size_t cap_count;
++    size_t cap_count = 0;
+     int rc = pcre_fullinfo(basedat, extradat, PCRE_INFO_CAPTURECOUNT, &cap_count);
+     I(rc == 0);
+ 
diff --git a/monotone.spec b/monotone.spec
index ecc3be3..4711b50 100644
--- a/monotone.spec
+++ b/monotone.spec
@@ -1,37 +1,31 @@
-Name: monotone
-Version: 0.48.1
-Release: 1%{?dist}
-
-Summary: A free, distributed version control system
-Group: Development/Tools
-License: GPLv2+
-
-URL: http://monotone.ca/
-Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz
-Source1: monotone.init
-Source2: monotone.sysconfig
-Source3: README.monotone-server
-Patch0: monotone-sqlite-3.7.3.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: zlib-devel
-BuildRequires: boost-devel >= 1.33.1
-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
-
+Name:            monotone
+Version:         0.99
+Release:         1%{?dist}
+Summary:         A free, distributed version control system
+Group:           Development/Tools
+License:         GPLv2+
+URL:             http://monotone.ca/
+Source0:         http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz
+Source1:         monotone.init
+Source2:         monotone.sysconfig
+Source3:         README.monotone-server
+Patch0:          monotone-0.99-bug-100.patch
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:   zlib-devel
+BuildRequires:   boost-devel >= 1.33.1
+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
-
+BuildRequires:   cvs
 # We need Emacs to byte-compile the Emacs Lisp code.
-BuildRequires: emacs
-
-Requires(post): /sbin/install-info
+BuildRequires:   emacs
+Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
+
 %description
 monotone is a free, distributed version control system.
 It provides fully disconnected operation, manages complete
@@ -41,6 +35,7 @@ metadata, exchanges work over plain network protocols,
 performs history-sensitive merging, and delegates trust
 functions to client-side RSA certificates.
 
+
 %package server
 Summary: Standalone server setup for monotone
 Requires: monotone = %{version}-%{release}
@@ -50,19 +45,23 @@ Requires(preun): initscripts, chkconfig
 Requires(postun): initscripts
 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
@@ -71,9 +70,11 @@ and then pass commands to it.
 %configure
 make %{?_smp_mflags}
 
+
 %check
 make %{?_smp_mflags} check || { cat tester_dir/*.log; false; }
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
@@ -84,56 +85,60 @@ mv %{buildroot}%{_datadir}/doc/%{name} _doc
 
 compldir=%{buildroot}%{_sysconfdir}/bash_completion.d
 mkdir -p ${compldir}
-%{__install} -c -m 0444 contrib/monotone.bash_completion ${compldir}
+install -c -m 0444 contrib/monotone.bash_completion ${compldir}
 
 lispdir=%{buildroot}%{_datadir}/emacs/site-lisp
 mkdir -p ${lispdir}
-%{__install} -c -m 0444 contrib/monotone*.el ${lispdir}
+install -c -m 0444 contrib/monotone*.el ${lispdir}
 emacs -batch -f batch-byte-compile ${lispdir}
 
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_localstatedir}/lib
 ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
-%{__install} -D -m 0555 %{SOURCE1} \
+install -D -m 0555 %{SOURCE1} \
              %{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
-%{__install} -d -m 0770 %{buildroot}%{_localstatedir}/lib/monotone
-%{__install} -d -m 0755 %{buildroot}%{_localstatedir}/run/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
+install -d -m 0770 %{buildroot}%{_localstatedir}/lib/monotone
+install -d -m 0755 %{buildroot}%{_localstatedir}/run/monotone
 
 # These do not actually wind up in the package, due to %%ghost.
-%{__install} -c -m 0440 /dev/null \
+install -c -m 0440 /dev/null \
              %{buildroot}%{_sysconfdir}/monotone/passphrase.lua
-%{__install} -c -m 0640 /dev/null \
+install -c -m 0640 /dev/null \
              %{buildroot}%{_sysconfdir}/monotone/read-permissions
-%{__install} -c -m 0640 /dev/null \
+install -c -m 0640 /dev/null \
              %{buildroot}%{_sysconfdir}/monotone/write-permissions
-%{__install} -c -m 0644 /dev/null \
+install -c -m 0644 /dev/null \
              %{buildroot}%{_sysconfdir}/monotone/monotonerc
 touch %{buildroot}%{_localstatedir}/lib/monotone/server.mtn
 
 cp %{SOURCE3} .
 
-%{__install} -D -m 0644 -p contrib/Monotone.pm \
+install -D -m 0644 -p contrib/Monotone.pm \
              %{buildroot}%{perl_vendorlib}/Monotone.pm
 
+
 %clean
 rm -f README.monotone-server
 rm -rf %{buildroot}
 
+
 %post
 if [ $1 -eq 1 ]
 then
         /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 || :
 fi
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE
@@ -143,11 +148,14 @@ fi
 %{_infodir}/monotone.info*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 %{_sysconfdir}/bash_completion.d
+%{_mandir}/man1/*.1*
+
 
 %files -n perl-Monotone
 %defattr(-,root,root,-)
 %{perl_vendorlib}/Monotone.pm
 
+
 %files server
 %defattr(-,root,root,-)
 %doc README.monotone-server
@@ -164,6 +172,7 @@ fi
 %dir %attr(0770,monotone,monotone) %{_localstatedir}/lib/monotone
 %attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_localstatedir}/lib/monotone/server.mtn
 
+
 %pre server
 # Add "monotone" user per http://fedoraproject.org/wiki/Packaging/UsersAndGroups
 getent group monotone > /dev/null || groupadd -r monotone
@@ -172,16 +181,19 @@ useradd -r -g monotone -r -d %{_localstatedir}/lib/monotone -s /sbin/nologin \
         -c "Monotone Netsync Server" monotone
 exit 0
 
+
 %post server
 # Register the monotone service
 /sbin/chkconfig --add monotone
 
+
 %preun server
 if [ $1 = 0 ]; then
         /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.
@@ -190,6 +202,13 @@ fi
 
 
 %changelog
+* Fri Oct 29 2010 Thomas Moschny <thomas.moschny at gmx.de> - 0.99-1
+- Update to 0.99.
+- Remove patch already applied upstream.
+- Add patch for monotone bug #100.
+- Include the monotone manpage in the package.
+- Specfile cleanups.
+
 * Wed Oct 27 2010 Thomas Moschny <thomas.moschny at gmx.de> - 0.48.1-1
 - Update to 0.48.1.
 - Add patch from upstream to support newer sqlite.
diff --git a/sources b/sources
index e6505fd..262fcbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5fa9e3b02ca3dcaf58fb7a2519ef956  monotone-0.48.1.tar.gz
+d9ff611f02b808bb746118ec06c02644  monotone-0.99.tar.gz
