Hello community,
here is the log from the commit of package netbeans-svnclientadapter for openSUSE:Factory
checked in at Thu Apr 8 12:34:07 CEST 2010.
--------
--- netbeans-svnclientadapter/netbeans-svnclientadapter.changes 2009-06-04 10:21:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/netbeans-svnclientadapter/netbeans-svnclientadapter.changes 2010-04-08 10:31:49.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Apr 8 08:25:00 UTC 2010 - mvyskocil@suse.cz
+
+- update to 6.7.1 (merged with netbeans-svnclientadapter-6.7.1-2.fc12.src.rpm)
+ the bugfix release
+ * improve logging
+ * svn conflicts handling
+ * bug fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
svnClientAdapter-1.4.0-build.patch
svnClientAdapter-1.4.0-nojars.tar.bz2
New:
----
svnClientAdapter-1.6.0-build.patch
svnClientAdapter-1.6.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netbeans-svnclientadapter.spec ++++++
--- /var/tmp/diff_new_pack.UkLWhT/_old 2010-04-08 12:34:00.000000000 +0200
+++ /var/tmp/diff_new_pack.UkLWhT/_new 2010-04-08 12:34:00.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package netbeans-svnclientadapter (Version 6.5)
+# spec file for package netbeans-svnclientadapter (Version MACRO)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,54 +16,62 @@
#
-%define nb_ netbeans
-%define nb_org %{nb_}.org
-%define nb_ver 6.5
+%global __jar_repack %{nil}
+
+%global nb_ netbeans
+%global nb_org %{nb_}.org
+%global nb_ver 6.7.1
+
+%global svnCA svnClientAdapter
+%global svnCA_ver 1.6.0
Name: netbeans-svnclientadapter
-Version: 6.5
+Version: %{nb_ver}
Release: 2
Summary: Subversion Client Adapter
+
License: ASL 2.0
Url: http://subclipse.tigris.org/svnClientAdapter.html
-Group: Development/Libraries
-%define svnCA_ver 1.4.0
+Group: Development/Libraries/Java
+
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
-# svn --username guest co \
-# http://subclipse.tigris.org/svn/subclipse/tags/subclipse/%{svnCA_ver}/svnClientAdapter \
-# svnClientAdapter
-# rm svnClientAdapter/lib/* #bnc#509501
-# tar --exclude-vcs -czvf svnClientAdapter-%{svnCA_ver}-nojars.tar.gz svnClientAdapter
-Source0: svnClientAdapter-%{svnCA_ver}-nojars.tar.bz2
-Patch0: svnClientAdapter-%{svnCA_ver}-build.patch
+# svn export --force --username guest -r4383 \
+# http://subclipse.tigris.org/svn/subclipse/trunk/svnClientAdapter/ \
+# svnClientAdapter-1.6.0
+# tar -czvf svnClientAdapter-1.6.0.tar.gz svnClientAdapter-1.6.0
+Source0: %{svnCA}-%{svnCA_ver}.tar.bz2
+Patch0: %{svnCA}-%{svnCA_ver}-build.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
+
BuildRequires: ant
BuildRequires: ant-nodeps
BuildRequires: ant-junit
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1.6.0
BuildRequires: jpackage-utils
BuildRequires: subversion-javahl
-Requires: java
+
+Requires: java >= 1.6.0
Requires: jpackage-utils
-Requires: subversion-javahl
-Provides: libnb-svnClientAdapter = 6.1
+Requires: subversion
%description
SVNClientAdapter is a high-level Java API for Subversion.
%prep
-%setup -q -n svnClientAdapter
+%setup -q -n %{svnCA}-%{svnCA_ver}
+
# remove all binary libs
find . -name "*.jar" -exec %{__rm} -f {} \;
+
%patch0 -p1 -b .sav
-#%{__ln_s} -f %{_javadir}//svnkit-javahl.jar lib/svnjavahl.jar
-%{__ln_s} -f $(build-classpath svn-javahl.jar) lib/svnjavahl.jar
+
+%{__ln_s} -f %{_javadir}/svnkit-javahl.jar lib/svnjavahl.jar
%build
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-export CLASSPATH=$CLASSPATH:lib/svnjavahl.jar
ant -verbose svnClientAdapter.jar
%install
++++++ svnClientAdapter-1.4.0-build.patch -> svnClientAdapter-1.6.0-build.patch ++++++
--- netbeans-svnclientadapter/svnClientAdapter-1.4.0-build.patch 2009-05-19 15:06:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/netbeans-svnclientadapter/svnClientAdapter-1.6.0-build.patch 2010-03-24 11:01:58.000000000 +0100
@@ -1,36 +1,61 @@
-diff -Nur svnClientAdapter/build.properties svnClientAdapter.new/build.properties
---- svnClientAdapter/build.properties 2008-12-23 19:54:52.000000000 +0300
-+++ svnClientAdapter.new/build.properties 2008-12-25 19:31:37.000000000 +0300
-@@ -35,9 +35,9 @@
+diff -Nur svnClientAdapter-1.6.0/build.properties svnClientAdapter-1.6.0.new/build.properties
+--- svnClientAdapter-1.6.0/build.properties 2007-08-27 18:37:03.000000000 +0400
++++ svnClientAdapter-1.6.0.new/build.properties 2009-08-11 22:50:17.000000000 +0400
+@@ -34,10 +34,10 @@
+ # -----------------------------------------------------------------------------
# all jar needed
# -----------------------------------------------------------------------------
- lib.dir=lib
+-lib.dir=lib
-svnjavahl.jar=${lib.dir}/svnjavahl.jar
-svnkit.jar=${lib.dir}/svnkit.jar
-ganymed.jar=${lib.dir}/ganymed.jar
-+svnjavahl.jar=/usr/share/java/svn-javahl.jar
-+#svnkit.jar=/usr/share/java/svnkit.jar
++lib.dir=/usr/share/java
++svnjavahl.jar=${lib.dir}/svn-javahl.jar
++#svnkit.jar=${lib.dir}/svnkit.jar
+#ganymed.jar=${lib.dir}/ganymed.jar
# -----------------------------------------------------------------------------
# JavaHL win32 lib dir
-diff -Nur svnClientAdapter/build.xml svnClientAdapter.new/build.xml
---- svnClientAdapter/build.xml 2008-12-23 19:54:52.000000000 +0300
-+++ svnClientAdapter.new/build.xml 2008-12-25 19:31:13.000000000 +0300
-@@ -54,14 +54,14 @@
+diff -Nur svnClientAdapter-1.6.0/build.xml svnClientAdapter-1.6.0.new/build.xml
+--- svnClientAdapter-1.6.0/build.xml 2007-08-27 18:37:03.000000000 +0400
++++ svnClientAdapter-1.6.0.new/build.xml 2009-08-11 20:06:01.000000000 +0400
+@@ -32,12 +32,14 @@
+