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: 11-Jan-2006 12:04:08
Branch: HEAD Handle: 2006011111040700
Added files:
openpkg-src/cvstrac cvstrac.patch
Modified files:
openpkg-src/cvstrac cvstrac.spec
Log:
upgrading package: cvstrac 1.1.5 -> 1.2.1
Summary:
Revision Changes Path
1.6 +37 -0 openpkg-src/cvstrac/cvstrac.patch
1.41 +16 -5 openpkg-src/cvstrac/cvstrac.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvstrac/cvstrac.patch
============================================================================
$ cvs diff -u -r0 -r1.6 cvstrac.patch
--- /dev/null 2006-01-11 12:04:07 +0100
+++ cvstrac.patch 2006-01-11 12:04:07 +0100
@@ -0,0 +1,37 @@
+Index: svn.c
+--- svn.c.orig 2006-01-10 02:27:04 +0100
++++ svn.c 2006-01-11 11:56:57 +0100
+@@ -258,6 +258,7 @@
+ */
+ for(nRev=nBaseRevision+1; nRev<=nHeadRevision; nRev++){
+ int nAddChng = 1;
++ int isMsgEnd = 0;
+ /* Example output of "svnlook info" is as follows:
+ **
+ ** chorlya <-Author
+@@ -312,6 +313,8 @@
+ }else if( nLine==2 ){
+ pRev->nMsgLength = atoi(zLine);
+ if( pRev->nMsgLength==0 ){
++ isMsgEnd = 1;
++ pRev->zMessage = "";
+ break; /* No comment here */
+ }else{
+ /* Allocate storage space for comment.
+@@ -332,7 +335,7 @@
+ /* Concat comment lines into one string */
+ strcat(pRev->zMessage, zLine);
+ }
+-
++ if( isMsgEnd ) break;
+ nLine++;
+ }
+ pclose(in);
+@@ -357,6 +360,7 @@
+ ** If it deviates from it too much, abort.
+ */
+ if( nAddChng ){
++ if( pRev->zMessage==0 ) pRev->zMessage = "";
+ db_execute(
+ "INSERT INTO chng(cn, date, branch, milestone, user, message) "
+ "VALUES(%d,%d,'',0,'%q','%q');",
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvstrac/cvstrac.spec
============================================================================
$ cvs diff -u -r1.40 -r1.41 cvstrac.spec
--- openpkg-src/cvstrac/cvstrac.spec 1 Jan 2006 13:12:52 -0000 1.40
+++ openpkg-src/cvstrac/cvstrac.spec 11 Jan 2006 11:04:07 -0000 1.41
@@ -32,12 +32,13 @@
Class: BASE
Group: Database
License: GPL
-Version: 1.1.5
-Release: 20041217
+Version: 1.2.1
+Release: 20060111
# list of sources
-Source0: http://www.cvstrac.org/cvstrac-src-%{version}.tar.gz
+Source0: http://www.cvstrac.org/cvstrac-%{version}.tar.gz
Source1: cvstrac.cgi
+Patch0: cvstrac.patch
# build information
Prefix: %{l_prefix}
@@ -59,11 +60,12 @@
prog cvstrac = {
version = %{version}
url = http://www.cvstrac.org/cvstrac/wiki?p=DownloadCvstrac
- regex = cvstrac-src-(__VER__)\.tar\.gz
+ regex = cvstrac-(__VER__)\.tar\.gz
}
%prep
%setup -q
+ %patch -p0
%build
libs="-lsqlite -lcrypt -lm"
@@ -76,6 +78,12 @@
TCC="%{l_cc} %{l_cflags -O} %{l_cppflags}" \
LIBSQLITE="%{l_ldflags} $libs" \
E=""
+ %{l_make} %{l_mflags} -f main.mk \
+ SRCDIR=`pwd` \
+ BCC="%{l_cc} %{l_cflags -O} %{l_cppflags}" \
+ TCC="%{l_cc} %{l_cflags -O} %{l_cppflags}" \
+ LIBSQLITE="%{l_ldflags} $libs" \
+ APPNAME="svntrac" E=""
%install
rm -rf $RPM_BUILD_ROOT
@@ -84,9 +92,12 @@
$RPM_BUILD_ROOT%{l_prefix}/cgi \
$RPM_BUILD_ROOT%{l_prefix}/var/cvstrac
%{l_shtool} install -c -s -m 755 \
- cvstrac $RPM_BUILD_ROOT%{l_prefix}/bin/
+ cvstrac svntrac $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE cvstrac.cgi} $RPM_BUILD_ROOT%{l_prefix}/cgi/cvstrac
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ -e 's;bin/cvstrac;bin/svntrac;g' \
+ %{SOURCE cvstrac.cgi} $RPM_BUILD_ROOT%{l_prefix}/cgi/svntrac
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%dir %attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/cvstrac'
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
