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: 19-Jun-2008 21:48:29
Branch: HEAD Handle: 2008061920482701
Modified files:
openpkg-src/subversion subversion.patch subversion.spec
Log:
upgrading package: subversion 1.4.6 -> 1.5.0
Summary:
Revision Changes Path
1.21 +25 -33 openpkg-src/subversion/subversion.patch
1.142 +13 -11 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.patch
============================================================================
$ cvs diff -u -r1.20 -r1.21 subversion.patch
--- openpkg-src/subversion/subversion.patch 21 Dec 2007 08:22:34 -0000
1.20
+++ openpkg-src/subversion/subversion.patch 19 Jun 2008 19:48:27 -0000
1.21
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2007-03-03 01:30:11 +0100
-+++ Makefile.in 2007-12-21 09:14:35 +0100
-@@ -144,7 +144,7 @@
+--- Makefile.in.orig 2008-02-24 04:36:03 +0100
++++ Makefile.in 2008-04-03 09:53:06 +0200
+@@ -155,7 +155,7 @@
LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
# special compilation for files destined for mod_dav_svn
@@ -10,7 +10,7 @@
# special compilation for files destined for libsvn_swig_* (e.g.
swigutil_*.c)
COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE)
$(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
-@@ -159,7 +159,7 @@
+@@ -170,7 +170,7 @@
LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS)
$(LDFLAGS) -rpath $(libdir)
# special link rule for mod_dav_svn
@@ -18,28 +18,19 @@
+LINK_APACHE_MOD = @APXS@ -c -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" $(LDFLAGS)
$(APACHE_LDFLAGS)
# Compilation of SWIG-generated C source code
- COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile
$(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_INCLUDES) $(SWIG_PY_INCLUDES) -prefer-pic
-c -o $@
-@@ -606,7 +606,7 @@
+ COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile
$(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@
+@@ -638,7 +638,7 @@
./config.status subversion/bindings/swig/perl/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
+ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL INSTALLDIRS=vendor
- swig-pl_DEPS = autogen-swig-pl libsvn_client libsvn_delta libsvn_diff \
- libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl \
+ swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
+ $(SWIG_PL_DIR)/native/Makefile
Index: apr-util/crypto/getuuid.c
---- apr-util/crypto/getuuid.c.orig 2007-12-17 23:01:12 +0100
-+++ apr-util/crypto/getuuid.c 2007-12-21 09:14:35 +0100
-@@ -102,7 +102,7 @@
- static void get_pseudo_node_identifier(unsigned char *node)
- {
- get_random_info(node);
-- node[0] |= 0x80; /* this designates a random node ID
*/
-+ node[0] |= 0x01; /* this designates a random node ID
*/
- }
-
- static void get_system_time(apr_uint64_t *uuid_time)
+--- apr-util/crypto/getuuid.c.orig 2008-03-13 08:00:29 +0100
++++ apr-util/crypto/getuuid.c 2008-04-03 09:53:51 +0200
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ -50,21 +41,21 @@
return rand() & 0x0FFFF;
Index: build-outputs.mk
---- build-outputs.mk.orig 2007-12-17 23:01:27 +0100
-+++ build-outputs.mk 2007-12-21 09:14:35 +0100
-@@ -309,7 +309,7 @@
- mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo
subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/file_revs.lo
subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/lock.lo
subversion/mod_dav_svn/log.lo subversion/mod_dav_svn/merge.lo
subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/replay.lo
subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/update.lo
subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo
subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la
subversion/libsvn_delta/libsvn_delta-1.la
subversion/libsvn_subr/libsvn_subr-1.la
- mod_dav_svn_OBJECTS = activity.lo deadprops.lo file_revs.lo liveprops.lo
lock.lo log.lo merge.lo mod_dav_svn.lo replay.lo repos.lo update.lo util.lo
version.lo
+--- build-outputs.mk.orig 2008-03-13 08:00:51 +0100
++++ build-outputs.mk 2008-04-03 09:53:06 +0200
+@@ -333,7 +333,7 @@
+ mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo
subversion/mod_dav_svn/authz.lo subversion/mod_dav_svn/deadprops.lo
subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/lock.lo
subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mirror.lo
subversion/mod_dav_svn/mod_dav_svn.lo
subversion/mod_dav_svn/reports/dated-rev.lo
subversion/mod_dav_svn/reports/file-revs.lo
subversion/mod_dav_svn/reports/get-location-segments.lo
subversion/mod_dav_svn/reports/get-locations.lo
subversion/mod_dav_svn/reports/get-locks.lo
subversion/mod_dav_svn/reports/log.lo
subversion/mod_dav_svn/reports/mergeinfo.lo
subversion/mod_dav_svn/reports/replay.lo
subversion/mod_dav_svn/reports/update.lo subversion/mod_dav_svn/repos.lo
subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo
subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la
subversion/libsvn_delta/libsvn_delta-1.la
subversion/libsvn_subr/libsvn_subr-1.la
+ mod_dav_svn_OBJECTS = activity.lo authz.lo deadprops.lo liveprops.lo
lock.lo merge.lo mirror.lo mod_dav_svn.lo reports/dated-rev.lo
reports/file-revs.lo reports/get-location-segments.lo reports/get-locations.lo
reports/get-locks.lo reports/log.lo reports/mergeinfo.lo reports/replay.lo
reports/update.lo repos.lo util.lo version.lo
subversion/mod_dav_svn/mod_dav_svn.la: $(mod_dav_svn_DEPS)
- cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la
$(LT_NO_UNDEFINED) $(mod_dav_svn_OBJECTS)
../../subversion/libsvn_repos/libsvn_repos-1.la
../../subversion/libsvn_fs/libsvn_fs-1.la
../../subversion/libsvn_delta/libsvn_delta-1.la
../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
+ cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la
$(LT_NO_UNDEFINED) $(mod_dav_svn_OBJECTS)
../../subversion/libsvn_repos/libsvn_repos-1.la
../../subversion/libsvn_fs/libsvn_fs-1.la
../../subversion/libsvn_fs_base/libsvn_fs_base-1.la
../../subversion/libsvn_fs_fs/libsvn_fs_fs-1.la
../../subversion/libsvn_delta/libsvn_delta-1.la
../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
- mucc_PATH = contrib/client-side
- mucc_DEPS = contrib/client-side/mucc.o
subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_ra/libsvn_ra-1.la
subversion/libsvn_subr/libsvn_subr-1.la
+ opt_test_PATH = subversion/tests/libsvn_subr
+ opt_test_DEPS = subversion/tests/libsvn_subr/opt-test.o
subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la
Index: configure
---- configure.orig 2007-12-17 23:01:31 +0100
-+++ configure 2007-12-21 09:14:35 +0100
-@@ -4207,6 +4207,11 @@
+--- configure.orig 2008-03-13 08:00:53 +0100
++++ configure 2008-04-03 09:53:06 +0200
+@@ -4958,6 +4958,11 @@
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
@@ -77,9 +68,9 @@
if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args
--cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $args
then :
Index: subversion/bindings/swig/perl/native/Makefile.PL.in
---- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2005-11-16
15:19:09 +0100
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2007-12-21
09:14:35 +0100
-@@ -23,16 +23,12 @@
+--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2007-10-22
09:00:25 +0200
++++ subversion/bindings/swig/perl/native/Makefile.PL.in 2008-04-03
09:54:42 +0200
+@@ -23,17 +23,13 @@
ra_dav
fs_base
fs_fs/));
@@ -87,6 +78,7 @@
+my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr delta ra_dav
subr ra_local ra_svn fs_base fs_fs/);
my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
+ my $cppflags = '@CPPFLAGS@';
my $apr_cflags = '@SVN_APR_INCLUDES@';
my $apu_cflags = '@SVN_APRUTIL_INCLUDES@';
-
@@ -98,7 +90,7 @@
chomp $apr_shlib_path_var;
-@@ -44,9 +40,9 @@
+@@ -46,9 +42,9 @@
" -I$svnlib_builddir",
" -I$swig_srcdir -g"),
OBJECT => q/$(O_FILES)/,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.141 -r1.142 subversion.spec
--- openpkg-src/subversion/subversion.spec 4 May 2008 12:09:44 -0000
1.141
+++ openpkg-src/subversion/subversion.spec 19 Jun 2008 19:48:28 -0000
1.142
@@ -22,8 +22,8 @@
##
# package version
-%define V_dist 1.4.6
-%define V_opkg 1.4.6
+%define V_dist 1.5.0
+%define V_opkg 1.5.0
%define V_cvs2svn 2.1.1
%define V_svn2cvs 20080504
%define V_book_html 20080504
@@ -40,7 +40,7 @@
Group: SCM
License: Apache/BSD
Version: %{V_opkg}
-Release: 20080504
+Release: 20080619
# package options
%option with_cvs2svn no
@@ -98,6 +98,7 @@
%endif
AutoReq: no
AutoReqProv: no
+Provides: subversion = %{version}-%{release}
%description
Subversion is a modern Version Control System (VCS) providing most
@@ -110,7 +111,7 @@
prog subversion = {
version = %{V_dist}
url =
http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260
- regex = subversion-(\d+\.\d+\.\d+)\.tar\.bz2
+ regex = subversion-(1\.5\.\d+)\.tar\.bz2
}
prog subversion:cvs2svn = {
version = %{V_cvs2svn}
@@ -161,10 +162,11 @@
CONFIG_SHELL="%{l_bash}" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--with-berkeley-db=%{l_prefix} \
--with-dbm=db45 \
--with-ssl=openssl \
- --with-zlib \
+ --with-zlib=%{l_prefix} \
--without-libxml2 \
--without-gssapi \
%if "%{with_apache}" == "yes"
@@ -194,8 +196,8 @@
# build Perl bindings
%if "%{with_perl}" == "yes"
- ( cd apr; ln -s .libs/libapr-0.a . ) || exit $?
- ( cd apr-util; ln -s .libs/libaprutil-0.a . ) || exit $?
+ ( cd apr; ln -s .libs/libapr-1.a . ) || exit $?
+ ( cd apr-util; ln -s .libs/libaprutil-1.a . ) || exit $?
%{l_make} %{l_mflags} swig-pl
%endif
@@ -238,7 +240,7 @@
%endif
# adjust APR installation for SVN local namespace
- ( cd $RPM_BUILD_ROOT%{l_prefix}/include/apr-0
+ ( cd $RPM_BUILD_ROOT%{l_prefix}/include/apr-1
for i in *; do
mv $i ../subversion-1/svn_$i
done
@@ -274,18 +276,18 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libexpat.*
rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/neon
rmdir $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion >/dev/null 2>&1 ||
true
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/apr-0
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/apr-1
rm -f $RPM_BUILD_ROOT%{l_prefix}/include/subversion-1/svn-revision.txt
rm -f $RPM_BUILD_ROOT%{l_prefix}/include/subversion-1/mod_dav_svn.h
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/build
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/build-1
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/neon*
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
# install svn_load_dirs(1) tool
%{l_shtool} install -c -m 755 \
-e 's;#!/usr/bin/perl;#!%{l_prefix}/bin/perl;' \
- contrib/client-side/svn_load_dirs.pl \
+ contrib/client-side/svn_load_dirs/svn_load_dirs.pl \
$RPM_BUILD_ROOT%{l_prefix}/bin/svn_load_dirs
# install Subversion default global configuration files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
