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: 22-Jan-2005 16:58:57
Branch: HEAD Handle: 2005012215585700
Added files:
openpkg-src/subversion subversion.config subversion.servers
Modified files:
openpkg-src/subversion subversion.spec
Log:
packaging cleanup and add global default config (actually all
out-commented)
Summary:
Revision Changes Path
1.1 +39 -0 openpkg-src/subversion/subversion.config
1.1 +29 -0 openpkg-src/subversion/subversion.servers
1.75 +35 -19 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.config
============================================================================
$ cvs diff -u -r0 -r1.1 subversion.config
--- /dev/null 2005-01-22 16:58:57 +0100
+++ subversion.config 2005-01-22 16:58:57 +0100
@@ -0,0 +1,39 @@
+##
+## config -- Subversion global configuration file
+##
+
+# [auth]
+# store-passwords = no
+# store-auth-creds = no
+
+# [helpers]
+# editor-cmd = @l_prefix@/bin/vim
+# diff-cmd = @l_prefix@/bin/diff0
+# diff3-cmd = @l_prefix@/bin/diff3
+# diff3-has-program-arg = true
+
+# [tunnels]
+# ssh = $SVN_SSH ssh
+# rsh = $SVN_RSH rsh
+
+# [miscellany]
+# global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store
+# log-encoding = latin1
+# use-commit-times = yes
+# enable-auto-props = yes
+
+# [auto-props]
+# *.c = svn:eol-style=native
+# *.cpp = svn:eol-style=native
+# *.h = svn:eol-style=native
+# *.dsp = svn:eol-style=CRLF
+# *.dsw = svn:eol-style=CRLF
+# *.sh = svn:eol-style=native;svn:executable
+# *.txt = svn:eol-style=native
+# *.png = svn:mime-type=image/png
+# *.jpg = svn:mime-type=image/jpeg
+# *.gif = svn:mime-type=image/gif
+# *.xml = svn:eol-style=native
+# *.tex = svn:eol-style=native
+# Makefile = svn:eol-style=native
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.servers
============================================================================
$ cvs diff -u -r0 -r1.1 subversion.servers
--- /dev/null 2005-01-22 16:58:57 +0100
+++ subversion.servers 2005-01-22 16:58:57 +0100
@@ -0,0 +1,29 @@
+##
+## servers -- Subversion global servers configuration file
+##
+
+# [groups]
+# group1 = *.example.com
+# group2 = *.example.net
+
+# [group1]
+# http-proxy-host = proxy1.some-domain-name.com
+# http-proxy-port = 80
+# http-proxy-username = blah
+# http-proxy-password = doubleblah
+# http-timeout = 60
+# neon-debug-mask = 130
+
+# [group2]
+# http-proxy-host = proxy2.some-domain-name.com
+# http-proxy-port = 9000
+
+# [global]
+# http-proxy-exceptions = *.exception.com, www.internal-site.org
+# http-proxy-host = defaultproxy.whatever.com
+# http-proxy-port = 7000
+# http-proxy-username = defaultusername
+# http-proxy-password = defaultpassword
+# http-compression = no
+# ssl-authority-files = /path/to/CAcert.pem;/path/to/CAcert2.pem
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.74 -r1.75 subversion.spec
--- openpkg-src/subversion/subversion.spec 22 Jan 2005 12:39:09 -0000
1.74
+++ openpkg-src/subversion/subversion.spec 22 Jan 2005 15:58:57 -0000
1.75
@@ -48,15 +48,17 @@
# 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: rc.subversion
+Source2: subversion.config
+Source3: subversion.servers
+Source4: rc.subversion
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, diffutils, gettext, make
-PreReq: OpenPKG, openpkg >= 20040130, diffutils, gettext
-BuildPreReq: libxml, db, openssl, zlib
-PreReq: libxml, db, openssl, zlib
+BuildPreReq: OpenPKG, openpkg >= 20040130, make
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: diffutils, gettext, libxml, db, openssl, zlib
+PreReq: diffutils, gettext, libxml, db, openssl, zlib
%if "%{with_cvs2svn}" == "yes"
PreReq: cvs, python
%endif
@@ -68,10 +70,11 @@
AutoReqProv: no
%description
- Subversion is a new version control system that is a compelling
- replacement for CVS. Currently this package provides the Subversion
- client and svnserve server. The Apache+WebDAV/DeltaV based
- mod_dav_svn server is not included.
+ Subversion is a modern Version Control System (VCS) providing most
+ current CVS features, versioned directories/renames/meta-data,
+ atomic commits, cheap branching and tagging, native client/server
+ architecture, and the choice of database or plain-file repository
+ implementations.
%track
prog subversion = {
@@ -94,6 +97,10 @@
%{l_shtool} subst \
-e 's;\($ac_abs_srcdir/configure\) $ac_configure_args;\1
--disable-shared;' \
configure
+ %{l_shtool} subst \
+ -e 's;/etc/subversion;%{l_prefix}/etc/subversion;g' \
+ subversion/libsvn_subr/config_impl.h \
+ subversion/libsvn_subr/config_file.c
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags libxml2 .}" \
@@ -120,10 +127,25 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
rm -rf $RPM_BUILD_ROOT%{l_prefix}/build
- rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/neon*
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/neon*
rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man3
- rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-config
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-config
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+
+ # install Subversion default global configuration files
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/subversion
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE subversion.config} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/subversion/config
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE subversion.servers} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/subversion/servers
+
+ # install Subversion Bash command completion
+ %{l_shtool} install -c -m 644 \
+ tools/client-side/bash_completion \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/subversion/bashrc
# install Subversion book
%{l_shtool} mkdir -f -p -m 755 \
@@ -133,13 +155,6 @@
doc/book/book/svn-book.pdf \
$RPM_BUILD_ROOT%{l_prefix}/share/subversion/
- # install Subversion Bash command completion
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/etc/subversion
- %{l_shtool} install -c -m 644 \
- tools/client-side/bash_completion \
- $RPM_BUILD_ROOT%{l_prefix}/etc/subversion/subversion.bashrc
-
%if "%{with_cvs2svn}" == "yes"
# install cvs2svn(1) tool
( cd subversion-tools
@@ -190,6 +205,7 @@
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+ '%config %{l_prefix}/etc/subversion/*' \
'%doc %{l_prefix}/share/subversion/svn-book.*'
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
