OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Jul-2004 14:10:18
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/subversion subversion.spec
Log:
fix with_cvs2svn and with_svn2cvs options; bless for BASE class
Summary:
Revision Changes Path
1.54 +42 -28 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 subversion.spec
--- openpkg-src/subversion/subversion.spec 11 Jun 2004 06:42:26 -0000 1.53
+++ openpkg-src/subversion/subversion.spec 2 Jul 2004 12:10:17 -0000 1.54
@@ -26,6 +26,7 @@
# package version
%define V_dist 1.0.5
%define V_opkg 1.0.5
+%define V_tools 20040702
# package information
Name: subversion
@@ -34,11 +35,11 @@
Vendor: Tigris
Packager: The OpenPKG Project
Distribution: OpenPKG
-Class: PLUS
+Class: BASE
Group: SCM
License: Apache/BSD
Version: %{V_opkg}
-Release: 20040611
+Release: 20040702
# package options
%option with_cvs2svn no
@@ -46,8 +47,8 @@
# list of sources
Source0: http://subversion.tigris.org/tarballs/subversion-%{V_dist}.tar.gz
-Source1: http://svnbook.red-bean.com/book.pdf
-Source2:
http://svn2cvs.tigris.org/nonav/source/browse/*checkout*/svn2cvs/src/svn2cvs.pl
+Source1:
ftp://ftp.openpkg.org/sources/CPY/subversion/subversion-tools-%{V_tools}.tar.gz
+Source2: http://svnbook.red-bean.com/book.pdf
Source3: rc.subversion
# build information
@@ -61,7 +62,8 @@
PreReq: cvs, python
%endif
%if "%{with_svn2cvs}" == "yes"
-PreReq: cvs, perl, perl-xml
+BuildPreReq: perl
+PreReq: perl, perl-xml, cvs, rcs
%endif
AutoReq: no
AutoReqProv: no
@@ -78,9 +80,15 @@
url =
http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260
regex = subversion-(__VER__)\.tar\.gz
}
+ prog subversion:tools = {
+ version = %{V_tools}
+ url = ftp://ftp.openpkg.org/sources/CPY/subversion/
+ regex = subversion-tools-(__VER__)\.tar\.gz
+ }
%prep
- %setup -q -n subversion-%{V_dist}
+ %setup -q
+ %setup -q -T -D -a 1
%build
# configure package
@@ -132,32 +140,38 @@
%if "%{with_cvs2svn}" == "yes"
# install cvs2svn(1) tool
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/rcsparse
- ( echo "#!/bin/sh"
- echo "PYTHONPATH=\"%{l_prefix}/libexec/subversion/cvs2svn\""
- echo "export PYTHONPATH"
- echo "%{l_prefix}/bin/python
%{l_prefix}/libexec/subversion/cvs2svn/cvs2svn.py \${1+\"[EMAIL PROTECTED]"}"
- ) >cvs2svn
- %{l_shtool} install -c -m 755 \
- cvs2svn $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} install -c -m 644 \
- tools/cvs2svn/cvs2svn.py \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/
- %{l_shtool} install -c -m 644 \
- tools/cvs2svn/rcsparse/*.py \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/rcsparse/
- %{l_shtool} install -c -m 644 \
- tools/cvs2svn/cvs2svn.1 \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ ( cd subversion-tools
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/rcsparse
+ ( echo "#!/bin/sh"
+ echo "PYTHONPATH=\"%{l_prefix}/libexec/subversion/cvs2svn\""
+ echo "export PYTHONPATH"
+ echo "%{l_prefix}/bin/python
%{l_prefix}/libexec/subversion/cvs2svn/cvs2svn.py \${1+\"[EMAIL PROTECTED]"}"
+ ) >cvs2svn.sh
+ %{l_shtool} install -c -m 755 \
+ cvs2svn.sh $RPM_BUILD_ROOT%{l_prefix}/bin/cvs2svn
+ %{l_shtool} install -c -m 644 \
+ cvs2svn.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ %{l_bzip2} -d -c cvs2svn.tar.bz2 | %{l_tar} xf -
+ %{l_shtool} install -c -m 644 \
+ cvs2svn/cvs2svn.py \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/
+ %{l_shtool} install -c -m 644 \
+ cvs2svn/rcsparse/*.py \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/rcsparse/
+ ) || exit $?
%endif
%if "%{with_svn2cvs}" == "yes"
# install svn2cvs(1) tool
- %{l_shtool} install -c -m 755 \
- -e 's;#!/usr/bin/perl;#!%{l_prefix}/bin/perl;' \
- %{SOURCE svn2cvs.pl} \
- $RPM_BUILD_ROOT%{l_prefix}/bin/svn2cvs
+ ( cd subversion-tools
+ %{l_shtool} install -c -m 755 \
+ -e 's;#!/usr/bin/perl;#!%{l_prefix}/bin/perl;' \
+ svn2cvs.pl $RPM_BUILD_ROOT%{l_prefix}/bin/svn2cvs
+ %{l_prefix}/bin/pod2man svn2cvs.pl >svn2cvs.1
+ %{l_shtool} install -c -m 644 \
+ svn2cvs.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/svn2cvs.1
+ ) || exit $?
%endif
# install run-command script
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
