OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Nov-2005 09:24:32
Branch: HEAD Handle: 2005112108243200
Modified files:
openpkg-src/subversion subversion.spec
Log:
switch to the latest tools world oder
Summary:
Revision Changes Path
1.100 +28 -24 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.99 -r1.100 subversion.spec
--- openpkg-src/subversion/subversion.spec 26 Aug 2005 07:18:33 -0000
1.99
+++ openpkg-src/subversion/subversion.spec 21 Nov 2005 08:24:32 -0000
1.100
@@ -23,9 +23,10 @@
##
# package version
-%define V_dist 1.2.3
-%define V_opkg 1.2.3
-%define V_tools 20050706
+%define V_dist 1.2.3
+%define V_opkg 1.2.3
+%define V_cvs2svn 1.3.0
+%define V_svn2cvs 20051121
# package information
Name: subversion
@@ -38,7 +39,7 @@
Group: SCM
License: Apache/BSD
Version: %{V_opkg}
-Release: 20050826
+Release: 20051121
# package options
%option with_cvs2svn no
@@ -48,10 +49,11 @@
# list of sources
Source0:
http://subversion.tigris.org/tarballs/subversion-%{V_dist}.tar.gz
-Source1:
ftp://ftp.openpkg.org/sources/CPY/subversion/subversion-tools-%{V_tools}.tar.gz
-Source2: subversion.config
-Source3: subversion.servers
-Source4: rc.subversion
+Source1:
ftp://ftp.openpkg.org/sources/CPY/subversion/cvs2svn-%{V_cvs2svn}.tar.gz
+Source2:
ftp://ftp.openpkg.org/sources/CPY/subversion/svn2cvs.pl-%{V_svn2cvs}
+Source3: subversion.config
+Source4: subversion.servers
+Source5: rc.subversion
Patch0: subversion.patch
# build information
@@ -95,15 +97,21 @@
url =
http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260
regex = subversion-(\d+\.\d+\.\d+)\.tar\.gz
}
- prog subversion:tools = {
- version = %{V_tools}
+ prog subversion:cvs2svn = {
+ version = %{V_cvs2svn}
url = ftp://ftp.openpkg.org/sources/CPY/subversion/
- regex = subversion-tools-(__VER__)\.tar\.gz
+ regex = cvs2svn-(__VER__)\.tar\.gz
+ }
+ prog subversion:svn2cvs = {
+ version = %{V_svn2cvs}
+ url = ftp://ftp.openpkg.org/sources/CPY/subversion/
+ regex = svn2cvs.pl-(__VER__)
}
%prep
%setup -q
%setup -q -T -D -a 1
+ cp %{SOURCE svn2cvs.pl-%{V_svn2cvs}} svn2cvs.pl
%patch -p0
# substitute path from applied patch
@@ -256,7 +264,7 @@
%if "%{with_cvs2svn}" == "yes"
# install cvs2svn(1) tool
- ( cd subversion-tools
+ ( cd cvs2svn-%{V_cvs2svn}
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/cvs2svn_rcsparse
( echo "#!/bin/sh"
@@ -268,26 +276,22 @@
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 \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/
+ cvs2svn $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/
%{l_shtool} install -c -m 644 \
- cvs2svn/cvs2svn_rcsparse/*.py \
+ cvs2svn_rcsparse/*.py \
$RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/cvs2svn_rcsparse/
) || exit $?
%endif
%if "%{with_svn2cvs}" == "yes"
# install svn2cvs(1) tool
- ( 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 $?
+ %{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
%endif
# install run-command script
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
