rpms/netbeans-svnclientadapter/devel import.log, 1.2, 1.3 netbeans-svnclientadapter.spec, 1.5, 1.6 svnClientAdapter-1.6.0-build.patch, 1.1, 1.2

[Victor G. Vasilyev]

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-svnclientadapter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27741/devel

Modified Files:
	import.log netbeans-svnclientadapter.spec 
	svnClientAdapter-1.6.0-build.patch 
Log Message:
Fix the svn-javahl.jar name and its location by the new patch



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Aug 2009 14:42:20 -0000	1.2
+++ import.log	11 Aug 2009 19:02:44 -0000	1.3
@@ -1,2 +1,3 @@
 netbeans-svnclientadapter-6_1-3_fc10:HEAD:netbeans-svnclientadapter-6.1-3.fc10.src.rpm:1218543570
 netbeans-svnclientadapter-6_7_1-1_fc12:HEAD:netbeans-svnclientadapter-6.7.1-1.fc12.src.rpm:1250001946
+netbeans-svnclientadapter-6_7_1-2_fc12:HEAD:netbeans-svnclientadapter-6.7.1-2.fc12.src.rpm:1250017628


Index: netbeans-svnclientadapter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/netbeans-svnclientadapter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- netbeans-svnclientadapter.spec	11 Aug 2009 14:42:20 -0000	1.5
+++ netbeans-svnclientadapter.spec	11 Aug 2009 19:02:44 -0000	1.6
@@ -10,7 +10,7 @@
 
 Name:           %{nb_}-svnclientadapter
 Version:        %{nb_ver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Subversion Client Adapter
 
 License:        ASL 2.0
@@ -73,6 +73,8 @@ ant -verbose svnClientAdapter.jar
 %{_javadir}/*
 
 %changelog
+* Tue Aug 11 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.7.1-2
+- Fix the svn-javahl.jar name and its location
 * Tue Aug 11 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
 - Adapt version 1.6.0 to NetBeans 6.7.1
 

svnClientAdapter-1.6.0-build.patch:
 build.properties |    8 ++++----
 build.xml        |    6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

Index: svnClientAdapter-1.6.0-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/svnClientAdapter-1.6.0-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- svnClientAdapter-1.6.0-build.patch	11 Aug 2009 14:42:20 -0000	1.1
+++ svnClientAdapter-1.6.0-build.patch	11 Aug 2009 19:02:44 -0000	1.2
@@ -1,40 +1,61 @@
-diff -Nur -x '*.orig' -x '*~' libnb-svnclientadapter-java-6.7/build.xml libnb-svnclientadapter-java-6.7.new/build.xml
---- libnb-svnclientadapter-java-6.7/build.xml	2009-07-13 13:50:39.000000000 +0400
-+++ libnb-svnclientadapter-java-6.7.new/build.xml	2009-07-13 13:52:01.000000000 +0400
-@@ -32,12 +32,6 @@
+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
+-svnjavahl.jar=${lib.dir}/svnjavahl.jar
+-svnkit.jar=${lib.dir}/svnkit.jar
+-ganymed.jar=${lib.dir}/ganymed.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-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 @@
      <depend srcDir="${src.javahl.dir}"
              destDir="${build.classes.dir}"
              cache="${build.cache.dir}"/>
--    <depend srcDir="${src.svnkit.dir}"
--            destDir="${build.classes.dir}"
--            cache="${build.cache.dir}"/>
--    <depend srcDir="${src.cmdline.dir}"
--            destDir="${build.classes.dir}"
--            cache="${build.cache.dir}"/>
++<!--
+     <depend srcDir="${src.svnkit.dir}"
+             destDir="${build.classes.dir}"
+             cache="${build.cache.dir}"/>
+     <depend srcDir="${src.cmdline.dir}"
+             destDir="${build.classes.dir}"
+             cache="${build.cache.dir}"/>
++-->
      <javac srcdir="${src.main.dir}"
             destdir="${build.classes.dir}"
             debug="${debug}"
-@@ -54,22 +48,7 @@
+@@ -54,6 +56,7 @@
+            includes="**"
+ 		   classpathref="project.classpath">
+     </javac>
++<!--
+     <javac srcdir="${src.svnkit.dir}"
+            destdir="${build.classes.dir}"
+            debug="${debug}"
+@@ -62,6 +65,8 @@
+            includes="**"
+ 		   classpathref="project.classpath">
+     </javac>
++-->
++<!--
+     <javac srcdir="${src.cmdline.dir}"
+            destdir="${build.classes.dir}"
+            debug="${debug}"
+@@ -70,6 +75,7 @@
             includes="**"
  		   classpathref="project.classpath">
      </javac>
--    <javac srcdir="${src.svnkit.dir}"
--           destdir="${build.classes.dir}"
--           debug="${debug}"
--		   source="${targetJvm}"    	
--		   target="${targetJvm}"    	
--           includes="**"
--		   classpathref="project.classpath">
--    </javac>
--    <javac srcdir="${src.cmdline.dir}"
--           destdir="${build.classes.dir}"
--           debug="${debug}"
--		   source="${targetJvm}"    	
--		   target="${targetJvm}"    	
--           includes="**"
--		   classpathref="project.classpath">
--    </javac>
-+
++-->
      <copy todir="${build.classes.dir}">
        <fileset dir="${src.main.dir}">
          <exclude name="**/*.java"/>