[cvs2svn] Use the man pages provided by the repository
Mark Chappell
tremble at fedoraproject.org
Fri Sep 17 07:17:11 UTC 2010
commit 349e316b1989e2e56cbd9cdb21aa7494d3c397e8
Author: Mark Chappell <tremble at fedoraproject.org>
Date: Thu Sep 16 14:54:15 2010 +0200
Use the man pages provided by the repository
cvs2svn.1 | 334 ----------------------------------------------------------
cvs2svn.spec | 18 +++-
2 files changed, 13 insertions(+), 339 deletions(-)
---
diff --git a/cvs2svn.spec b/cvs2svn.spec
index 7866c22..7f45c52 100644
--- a/cvs2svn.spec
+++ b/cvs2svn.spec
@@ -2,7 +2,7 @@
Name: cvs2svn
Version: 2.3.0
-Release: 0.2.r4998svn%{?dist}
+Release: 0.3.r4998svn%{?dist}
Summary: CVS to Subversion Repository Converter
Group: Development/Tools
@@ -12,8 +12,6 @@ URL: http://cvs2svn.tigris.org/
# svn co --username=guest http://cvs2svn.tigris.org/svn/cvs2svn/trunk cvs2svn-trunk
# (use blank password)
Source0: cvs2svn-trunk.tar.xz
-# Man page not in repository (but present in 2.2.0 tarball):
-Source1: cvs2svn.1
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
@@ -77,13 +75,17 @@ repeated synchronizations between CVS and Git.
%build
%{__python} setup.py build
+make man
%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
mkdir -p -m 0755 $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
+install -p -m 0644 cvs2git.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+install -p -m 0644 cvs2svn.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+#install -p -m 0644 cvs2hg.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+#install -p -m 0644 cvs2bzr.1 $RPM_BUILD_ROOT%{_mandir}/man1/
rm -f $RPM_BUILD_ROOT%{_bindir}/cvs2bzr
chmod a+x $RPM_BUILD_ROOT%{python_sitelib}/%{name}_rcsparse/{run-tests.py,parse_rcs_file.py}
chmod a+x $RPM_BUILD_ROOT%{python_sitelib}/%{name}_lib/{main.py,version.py}
@@ -100,23 +102,29 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc cvs2svn-example.options www/cvs2svn.html
-%{_mandir}/man?/*
+%{_mandir}/man?/cvs2svn.1*
%{_bindir}/cvs2svn
%files -n cvs2git
%defattr(-,root,root,-)
%doc cvs2git-example.options www/cvs2git.html
+%{_mandir}/man?/cvs2git.1*
%{_bindir}/cvs2git
#%files -n cvs2bzr
#%doc cvs2bzr-example.options www/cvs2bzr.html
+#%{_mandir}/man?/cvs2bzr.1*
#%{_bindir}/cvs2hg
#%files -n cvs2hg
#%doc cvs2hg-example.options
+#%{_mandir}/man?/cvs2hg.1*
#%{_bindir}/cvs2hg
%changelog
+* Thu Sep 16 2010 Mark Chappell <tremble at fedoraproject.org> - 2.3.0-0.3.r4998svn
+- Use the man pages provided by the repository
+
* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 2.3.0-0.2.r4998svn
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
More information about the scm-commits
mailing list