Mailinglist Archive: opensuse-commit (769 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package subversion for openSUSE:Factory
checked in at Wed Jun 10 02:21:38 CEST 2009.



--------
--- subversion/subversion.changes       2009-06-03 18:30:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/subversion/subversion.changes  2009-06-09 
20:50:02.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Jun  9 20:49:40 CEST 2009 - dmueller@xxxxxxx
+
+- remove ctypesgen package - not in factory yet
+
+-------------------------------------------------------------------
+Fri Jun  5 21:31:54 CEST 2009 - wr@xxxxxxxxxxxx
+
+- update svnmerge.py to the latest version
+  * not using popen2 anymore which was deprecated
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  svnmerge.py

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ subversion.spec ++++++
--- /var/tmp/diff_new_pack.K17806/_old  2009-06-10 02:21:05.000000000 +0200
+++ /var/tmp/diff_new_pack.K17806/_new  2009-06-10 02:21:05.000000000 +0200
@@ -26,7 +26,7 @@
 %define with_python_ctypes 0
 %else
 %define with_ruby          1
-%define with_python_ctypes 1
+%define with_python_ctypes 0
 %endif
 %define with_intree_sqlite 1
 %if 0%{?suse_version} > 1010
@@ -42,7 +42,7 @@
 
 Name:           subversion
 Version:        1.6.2
-Release:        1
+Release:        2
 # in-tree SWIG version to use for the build:
 %define swig_version   1.3.36
 %define sqlite_version 3.6.14.2
@@ -124,6 +124,7 @@
 Source0:        
http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2
 Source1:        subversion.conf
 Source2:        subversion.README.SuSE
+Source3:        svnmerge.py
 Source9:        subversion.rcsvnserve
 # http://prdownloads.sourceforge.net/swig/swig-%{swig_version}.tar.bz2
 Source10:       subversion.sysconfig.svnserve
@@ -557,7 +558,7 @@
 cp -avL contrib/client-side/emacs/*.el 
$RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
 rm -f $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/vc-svn.el
 #
-cp -avL contrib/client-side/svnmerge/svnmerge.py $RPM_BUILD_ROOT/usr/bin
+cp -avL %{SOURCE3} $RPM_BUILD_ROOT/usr/bin
 cp -avL contrib/client-side/svn_apply_autoprops.py $RPM_BUILD_ROOT/usr/bin
 #
 mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d
@@ -769,6 +770,11 @@
 %endif # with_kde4_kwallet
 
 %changelog
+* Tue Jun 09 2009 dmueller@xxxxxxx
+- remove ctypesgen package - not in factory yet
+* Fri Jun 05 2009 wr@xxxxxxxxxxxx
+- update svnmerge.py to the latest version
+  * not using popen2 anymore which was deprecated
 * Wed Jun 03 2009 dmueller@xxxxxxx
 - merge into Factory
 * Tue May 26 2009 pascal.bleser@xxxxxxxxxxxx

++++++ svnmerge.py ++++++
++++ 2370 lines (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx