Hello community, here is the log from the commit of package subversion checked in at Sat Apr 28 14:34:42 CEST 2007. -------- --- subversion/subversion.changes 2007-03-29 21:56:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/subversion/subversion.changes 2007-04-28 14:05:06.000000000 +0200 @@ -1,0 +2,15 @@ +Sat Apr 28 14:04:24 CEST 2007 - olh@suse.de + +- move cvs2svn and viewvc to separate specfile + +------------------------------------------------------------------- +Sat Apr 28 11:18:16 CEST 2007 - olh@suse.de + +- add sysconfig settings for remote access (247372) + +------------------------------------------------------------------- +Sat Apr 28 10:46:47 CEST 2007 - olh@suse.de + +- add an example to host svn on / to subversion.conf (179404) + +------------------------------------------------------------------- Old: ---- subversion.cvs2svn-1.5.x.tar.bz2 subversion.cvs2svn.install-prefix.patch subversion.viewvc-1.0.x.tar.bz2 subversion.viewvc-buglink.patch subversion.viewvc.conf New: ---- subversion.sysconfig.svnserve.remoteaccess ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.Q25685/_old 2007-04-28 14:34:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Q25685/_new 2007-04-28 14:34:25.000000000 +0200 @@ -13,7 +13,9 @@ Name: subversion BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages neon-devel openldap2-devel python-devel swig Version: 1.4.3 -Release: 7 +Release: 14 +# +%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services # %define apxs /usr/sbin/apxs2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) @@ -21,8 +23,6 @@ # %define site_python %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") # -%define viewvc_dir /srv/viewvc -# PreReq: %insserv_prereq %fillup_prereq # Summary: A Concurrent Versioning system similar to but better than CVS @@ -33,11 +33,9 @@ Source0: subversion-1.4.x.tar.bz2 Source1: subversion.conf Source2: subversion.README.SuSE -Source7: subversion.viewvc-1.0.x.tar.bz2 -Source8: subversion.viewvc.conf Source9: subversion.rcsvnserve Source10: subversion.sysconfig.svnserve -Source11: subversion.cvs2svn-1.5.x.tar.bz2 +Source12: subversion.sysconfig.svnserve.remoteaccess Source42: subversion.svngrep.sh Source43: subversion.svndiff.sh # @@ -54,10 +52,6 @@ patch34: subversion.allowed-neon.patch Patch35: subversion.java14.patch # -Patch42: subversion.viewvc-buglink.patch -# -Patch51: subversion.cvs2svn.install-prefix.patch -# %description Subversion does the same thing CVS does (Concurrent Versioning System) @@ -123,59 +117,6 @@ -%define cvs2svn_dir cvs2svn-1.5.x -%package -n cvs2svn -Version: 1.5.1 -Release: 7 -Provides: subversion-cvs2svn -Obsoletes: subversion-cvs2svn -Group: Development/Tools/Version Control -URL: http://cvs2svn.tigris.org/ -Summary: Converts CVS repositories to Subversion repositories -%define pyver %(python -c 'import sys; print sys.version[:3]') -Requires: python >= %pyver, python < %{pyver}.99 -Requires: rcs -Requires: subversion - -%description -n cvs2svn -Converts CVS repositories to Subversion repositories. - -See /usr/share/doc/packages/cvs2svn directory for more information. - - - -%package -n viewvc -Version: 1.0.3 -Release: 7 -Requires: subversion-python -Provides: subversion-viewcvs viewcvs -Obsoletes: subversion-viewcvs viewcvs -Group: Development/Tools/Version Control -URL: http://www.viewvc.org/ -Summary: ViewVC - Browse a Subversion Repository with a Web Browser - -%description -n viewvc -ViewVC is a browser interface for CVS and Subversion version control -repositories. It generates templatized HTML to present navigable -directory, revision, and change log listings. It can display specific -versions of files as well as diffs between those versions. Basically, -ViewVC provides the bulk of the report-like functionality you expect -out of your version control tool, but much more prettily than the -average textual command-line program output. - -ViewVC is the successor of ViewCVS. - - - -Authors: --------- - The ViewCVS Group: - * Greg Stein - * Tanaka Akira - * Tim Cera - * Peter Funk - * Jay Painter - %prep swig="`env -i swig -version 2>&1 | awk '/^SWIG Version/{ print $3 }'`" case "$swig" in @@ -184,7 +125,7 @@ exit 1 ;; esac -%setup -q -n subversion-1.4.x -a 7 -a 11 +%setup -q -n subversion-1.4.x # # warning: no newline at end of file echo "" >> subversion/bindings/java/javahl/native/Path.cpp @@ -204,13 +145,6 @@ %patch33 -p1 %patch34 -p1 %patch35 -p1 -# -pushd viewvc-1.0.x -%patch42 -popd -pushd %{cvs2svn_dir} -%patch51 -p1 -popd %build with_jdk=none @@ -339,59 +273,33 @@ # mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d cp -av %{S:1} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/subversion.conf -cp -av %{S:8} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/subversion.viewvc.conf # -cp -av %{S:2} README.SuSE -cp -av subversion/mod_authz_svn/INSTALL README.mod_authz_svn +cp -avL %{S:2} README.SuSE +cp -avL subversion/mod_authz_svn/INSTALL README.mod_authz_svn cat %name.lang > files.subversion cat with_jdk.files >> files.subversion -cd %{cvs2svn_dir} -make install DESTDIR=$RPM_BUILD_ROOT -cd .. # # tools mkdir -p $RPM_BUILD_ROOT/usr/share/subversion/ cp -a tools $RPM_BUILD_ROOT/usr/share/subversion/ -rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/cvs2svn +#m -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/cvs2svn mkdir $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs cp -aL contrib/client-side/svn_load_dirs.README $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/README cp -aL contrib/client-side/svn_load_dirs_property_table.example $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/ sed 's:@SVN_BINDIR@:/usr:' contrib/client-side/svn_load_dirs.pl.in > $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/svn_load_dirs.pl chmod 755 $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/svn_load_dirs.pl find $RPM_BUILD_ROOT \( -name .svn -o -name CVS -o -name tests \) -type d | xargs rm -rfv -# viewvc -pushd . -cd viewvc-1.0.x -./viewvc-install --prefix "%{viewvc_dir}" --destdir "$RPM_BUILD_ROOT" -sed ' -s@^#docroot.*@docroot = /viewvc-docroot@ -s@^default_root.*@default_root = your_unnamed_project@ -s@^cvsgraph_conf.*@cvsgraph_conf = %{viewvc_dir}/cvsgraph.conf@ -s@^hr_funout.*@hr_funout = 1@ -s@^show_changed_paths.*@show_changed_paths = 0@ -/^cvs_roots/,/^$/s/^/###/ -/^#svn_roots/,/^$/c\ -svn_roots:\ - your_unnamed_project : /srv/svn/repos/<your_unnamed_project> , \ - another_project : /srv/svn/repos/<another_project> \ -# -' < viewvc.conf.dist > $RPM_BUILD_ROOT%{viewvc_dir}/viewvc.conf -diff -up viewvc.conf.dist $RPM_BUILD_ROOT%{viewvc_dir}/viewvc.conf || true -popd -find $RPM_BUILD_ROOT%{viewvc_dir} -type d | \ -sed "s@$RPM_BUILD_ROOT@%dir @" > files.subversion.viewvc -find $RPM_BUILD_ROOT%{viewvc_dir} -type f | \ -sed "s@$RPM_BUILD_ROOT@@;/\/templates\/\|\.conf$/s@^@%config (noreplace) @" >> files.subversion.viewvc -cat files.subversion.viewvc # # # mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -cp -a %_sourcedir/subversion.rcsvnserve $RPM_BUILD_ROOT/etc/init.d/svnserve +cp -aL %_sourcedir/subversion.rcsvnserve $RPM_BUILD_ROOT/etc/init.d/svnserve ln -sv /etc/init.d/svnserve $RPM_BUILD_ROOT/usr/sbin/rcsvnserve -cp -a %_sourcedir/subversion.sysconfig.svnserve $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.svnserve +cp -aL %_sourcedir/subversion.sysconfig.svnserve $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.svnserve +mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} +install -m 644 %{S:12} $RPM_BUILD_ROOT/%{_fwdefdir}/svnserve # %post @@ -408,6 +316,7 @@ %attr(754,root,root) /etc/init.d/svnserve %attr(754,root,root) /usr/sbin/rcsvnserve /var/adm/fillup-templates/sysconfig.svnserve +%config %{_fwdefdir}/* # %attr(755,root,root) /usr/bin/svn %attr(755,root,root) /usr/bin/svnadmin @@ -455,13 +364,6 @@ %{_libdir}/libsvn*.la /usr/include/subversion-1/* -%files -n cvs2svn -%defattr(-,root,root) -%doc %{cvs2svn_dir}/{BUGS,COMMITTERS,COPYING,README,design-notes.txt,verify-cvs2svn.py,www/{faq,cvs2svn}.html} -%attr(755,root,root) /usr/bin/cvs2svn -%dir %{site_python}/cvs2svn_rcsparse -%{site_python}/cvs2svn* - %files tools %defattr(-,root,root) %dir /usr/share/subversion @@ -476,12 +378,13 @@ %{apache_libexecdir}/mod_dav_svn.* %{apache_libexecdir}/mod_authz_svn.* -%files -n viewvc -f files.subversion.viewvc -%defattr(-,root,root) -%dir %{apache_sysconfdir}/conf.d -%config (noreplace) %{apache_sysconfdir}/conf.d/subversion.viewvc.conf - %changelog +* Sat Apr 28 2007 - olh@suse.de +- move cvs2svn and viewvc to separate specfile +* Sat Apr 28 2007 - olh@suse.de +- add sysconfig settings for remote access (247372) +* Sat Apr 28 2007 - olh@suse.de +- add an example to host svn on / to subversion.conf (179404) * Thu Mar 29 2007 - olh@suse.de - add /usr/share/emacs to filelist * Sun Feb 25 2007 - olh@suse.de ++++++ subversion.conf ++++++ --- subversion/subversion.conf 2006-09-27 23:55:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/subversion/subversion.conf 2007-04-28 10:46:07.000000000 +0200 @@ -41,4 +41,49 @@ # </LimitExcept> #</Location> +## +## Hosting svn at "/" +## +#<VirtualHost *> +# ServerName svn.example.com +# ErrorLog /var/log/apache2/svn.example.com-error_log +# TransferLog /var/log/apache2/svn.example.com-access_log +# # +# # Do not set DocumentRoot. It is not needed here and just causes trouble. +# # +# # Map the error documents back to their defaults. +# # Otherwise mod_dav_svn tries to find a "error" repository. +# # +# ErrorDocument 400 default +# ErrorDocument 401 default +# ErrorDocument 403 default +# ErrorDocument 404 default +# ErrorDocument 405 default +# ErrorDocument 408 default +# ErrorDocument 410 default +# ErrorDocument 411 default +# ErrorDocument 412 default +# ErrorDocument 413 default +# ErrorDocument 414 default +# ErrorDocument 415 default +# ErrorDocument 500 default +# ErrorDocument 501 default +# ErrorDocument 502 default +# ErrorDocument 503 default +# # +# <Location /> +# DAV svn +# SVNParent /srv/svn/repositories/ +# SVNListParentPath on +# AuthType Basic +# AuthName "subversion repository" +# AuthBasicProvider file +# AuthUserFile /srv/svn/auth/svn.example.org.htpasswd +# SetOutputFilter DEFLATE +# <LimitExcept GET PROPFIND OPTIONS REPORT> +# Require valid-user +# </LimitExcept> +# </Location> +#</VirtualHost> + </IfModule> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org