rpms/netbeans-svnclientadapter/devel svnClientAdapter-1.6.0-build.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 netbeans-svnclientadapter.spec, 1.4, 1.5 sources, 1.3, 1.4 svnClientAdapter-1.4.0-build.patch, 1.1, NONE

Tue Aug 11 14:42:20 UTC 2009

Author: victorv

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

Modified Files:
	.cvsignore import.log netbeans-svnclientadapter.spec sources 
Added Files:
	svnClientAdapter-1.6.0-build.patch 
Removed Files:
	svnClientAdapter-1.4.0-build.patch 
Log Message:
Adapt the svnClientAdapter, version 1.6.0, revision 4383 to the NetBeans 6.7.1


svnClientAdapter-1.6.0-build.patch:
 build.xml |   23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

--- NEW FILE svnClientAdapter-1.6.0-build.patch ---
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 @@
     <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}"/>
     <javac srcdir="${src.main.dir}"
            destdir="${build.classes.dir}"
            debug="${debug}"
@@ -54,22 +48,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"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Jan 2009 17:14:41 -0000	1.3
+++ .cvsignore	11 Aug 2009 14:42:19 -0000	1.4
@@ -1 +1 @@
-svnClientAdapter-1.4.0.tar.gz
+svnClientAdapter-1.6.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	12 Aug 2008 12:21:23 -0000	1.1
+++ import.log	11 Aug 2009 14:42:20 -0000	1.2
@@ -1 +1,2 @@
 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


Index: netbeans-svnclientadapter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/netbeans-svnclientadapter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- netbeans-svnclientadapter.spec	25 Jul 2009 18:02:51 -0000	1.4
+++ netbeans-svnclientadapter.spec	11 Aug 2009 14:42:20 -0000	1.5
@@ -1,26 +1,30 @@
-%define nb_            netbeans
-%define nb_org         %{nb_}.org
-%define nb_ver         6.5
+# Prevent brp-java-repack-jars from being run.
+%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:           %{nb_}-svnclientadapter
 Version:        %{nb_ver}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Subversion Client Adapter
 
 License:        ASL 2.0
 Url:            http://subclipse.tigris.org/svnClientAdapter.html
 Group:          Development/Libraries
 
-%define svnCA_ver      1.4.0
 # 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
-# tar -czvf svnClientAdapter-%{svnCA_ver}.tar.gz svnClientAdapter
-Source0:        svnClientAdapter-%{svnCA_ver}.tar.gz
-
-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.gz
+Patch0:         %{svnCA}-%{svnCA_ver}-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -30,27 +34,24 @@ BuildRequires:  ant-nodeps
 BuildRequires:  ant-junit
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
-BuildRequires:  subversion-javahl >= 1.5.0
+BuildRequires:  subversion-javahl
 
 Requires:       java >= 1:1.6.0
 Requires:       jpackage-utils
-Requires:       subversion >= 1.4.5
-
-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 %{_javadir}/svnkit-javahl.jar lib/svnjavahl.jar
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java 
@@ -72,51 +73,6 @@ ant -verbose svnClientAdapter.jar
 %{_javadir}/*
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Dec 23 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.5-1
-- Adapt to NetBeans 6.5
-- Change URL tag
-- Use the original upstream's vcs (version 1.4.0)
-
-* Fri Aug  8 2008 Brian Pepple <bpepple at fedoraproject.org> - 6.1-3
-- Use the preferred method to package docs.
-- Remove Distribution tag.
-
-* Fri Aug 08 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-2
-- java-devel & jpackage-utils are added as the build requirements
-- jpackage-utils is added as the run-time requirement
-- An appropriate value of Group Tag is chosen from the official list
-- Both license.txt and readme.txt are added as the package documentation
-
-* Mon Jul 14 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-1
-- Upgrade to version 6.1 (6.0.1 sources are used)
-- Change BuldRoot
-- Bootstrap into Fedora
-
-* Thu Jan 24 2008 Jaroslav Tulach <jtulach at mandriva.org> 6.0.1-1mdv2008.1
-+ Revision: 157642
-- Upgrade to version 6.0.1
-
-  + Olivier Blin <oblin at mandriva.com>
-    - restore BuildRoot
-
-  + Thierry Vignaud <tvignaud at mandriva.com>
-    - kill re-definition of %%buildroot on Pixel's request
-
-* Sun Dec 16 2007 Anssi Hannula <anssi at mandriva.org> 0:6.0-3mdv2008.1
-+ Revision: 120971
-- buildrequire java-rpmbuild, i.e. build with icedtea on x86(_64)
-
-* Mon Dec 10 2007 Jaroslav Tulach <jtulach at mandriva.org> 0:6.0-2mdv2008.1
-+ Revision: 116985
-- Using pristine sources from svn repository rev. 3087, plus a modification patch
-
-* Thu Dec 06 2007 Jaroslav Tulach <jtulach at mandriva.org> 0:6.0-1mdv2008.1
-+ Revision: 115856
-- create libnb-svnClientAdapter
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Jan 2009 17:14:41 -0000	1.3
+++ sources	11 Aug 2009 14:42:20 -0000	1.4
@@ -1 +1 @@
-ba0e7ad0dd90e3c8193b1f1f3e4c10f2  svnClientAdapter-1.4.0.tar.gz
+dece54633ab9a93fe7b99378d78e7f1c  svnClientAdapter-1.6.0.tar.gz


--- svnClientAdapter-1.4.0-build.patch DELETED ---


