Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 663424 Details for
Bug 887162
Adapt version 1.7.0 to NetBeans 7.2.1
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Adapt version 1.7.0 to NetBeans 7.2.1
0001-Adapt-version-1.7.0-to-NetBeans-7.2.1.patch (text/plain), 6.25 KB, created by
gil cattaneo
on 2012-12-14 08:22:05 UTC
(
hide
)
Description:
Adapt version 1.7.0 to NetBeans 7.2.1
Filename:
MIME Type:
Creator:
gil cattaneo
Created:
2012-12-14 08:22:05 UTC
Size:
6.25 KB
patch
obsolete
>From 1b534992c5e41e8d05e3aab43a3b3289e81bb2ac Mon Sep 17 00:00:00 2001 >From: gil <puntogil@libero.it> >Date: Fri, 14 Dec 2012 09:19:38 +0100 >Subject: [PATCH] Adapt version 1.7.0 to NetBeans 7.2.1 > >--- > .gitignore | 1 + > netbeans-svnclientadapter.spec | 39 +++++++++++++--------------- > sources | 2 +- > svnClientAdapter-1.7.0-build.patch | 53 ++++++++++++++++++++++++++++++++++++++ > 4 files changed, 73 insertions(+), 22 deletions(-) > create mode 100644 svnClientAdapter-1.7.0-build.patch > >diff --git a/.gitignore b/.gitignore >index 9a9f0d7..31d00ee 100644 >--- a/.gitignore >+++ b/.gitignore >@@ -1 +1,2 @@ > svnClientAdapter-1.6.0.tar.gz >+/svnClientAdapter-1.7.0.tar.gz >diff --git a/netbeans-svnclientadapter.spec b/netbeans-svnclientadapter.spec >index 3bf0520..092436c 100644 >--- a/netbeans-svnclientadapter.spec >+++ b/netbeans-svnclientadapter.spec >@@ -3,34 +3,32 @@ > > %global nb_ netbeans > %global nb_org %{nb_}.org >-%global nb_ver 6.7.1 >+%global nb_ver 7.2.1 > > %global svnCA svnClientAdapter >-%global svnCA_ver 1.6.0 >+%global svnCA_ver 1.7.0 > > Name: %{nb_}-svnclientadapter > Version: %{nb_ver} >-Release: 5%{?dist} >+Release: 1%{?dist} > Summary: Subversion Client Adapter >- >-License: ASL 2.0 >+# see changelog.txt >+License: ASL 2.0 and EPL > Url: http://subclipse.tigris.org/svnClientAdapter.html > Group: Development/Libraries > > # The source for this package was pulled from upstream's vcs. Use the > # following commands to generate the tarball: >-# svn export --force --username guest -r4383 \ >+# svn export --force --username guest \ > # http://subclipse.tigris.org/svn/subclipse/trunk/svnClientAdapter/ \ >-# svnClientAdapter-1.6.0 >-# tar -czvf svnClientAdapter-1.6.0.tar.gz svnClientAdapter-1.6.0 >+# svnClientAdapter-1.7.0 >+# tar -czvf svnClientAdapter-1.7.0.tar.gz svnClientAdapter-1.7.0 > Source0: %{svnCA}-%{svnCA_ver}.tar.gz > Patch0: %{svnCA}-%{svnCA_ver}-build.patch > >-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) > BuildArch: noarch > > BuildRequires: ant >-BuildRequires: ant-nodeps > BuildRequires: ant-junit > BuildRequires: java-devel >= 1:1.6.0 > BuildRequires: jpackage-utils >@@ -47,32 +45,31 @@ SVNClientAdapter is a high-level Java API for Subversion. > %setup -q -n %{svnCA}-%{svnCA_ver} > > # remove all binary libs >-find . -name "*.jar" -exec %{__rm} -f {} \; >+find . -name "*.jar" -delete > > %patch0 -p1 -b .sav > >-%{__ln_s} -f %{_javadir}/svnkit-javahl.jar lib/svnjavahl.jar >+ln -sf %{_javadir}/svn-javahl.jar lib/svnjavahl.jar > > %build > [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java > ant -verbose svnClientAdapter.jar > > %install >-%{__rm} -fr %{buildroot} >-# jar >-%{__install} -d -m 755 %{buildroot}%{_javadir} >-%{__install} -m 644 build/lib/svnClientAdapter.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar >-%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar > >-%clean >-%{__rm} -rf %{buildroot} >+# jar >+install -d -m 755 %{buildroot}%{_javadir} >+install -m 644 build/lib/svnClientAdapter.jar %{buildroot}%{_javadir}/%{name}.jar > > %files >-%defattr(-,root,root) >-%doc license.txt readme.txt >+%doc changelog.txt license.txt readme.txt > %{_javadir}/* > > %changelog >+* Wed Dec 12 2012 gil cattaneo <puntogil@libero.it> 7.2.1-1 >+- Adapt version 1.7.0 to NetBeans 7.2.1 >+- Adapt to current guideline >+ > * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.7.1-5 > - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild > >diff --git a/sources b/sources >index 6f9197d..1b84de2 100644 >--- a/sources >+++ b/sources >@@ -1 +1 @@ >-dece54633ab9a93fe7b99378d78e7f1c svnClientAdapter-1.6.0.tar.gz >+5803bf4676ee9171f43c346f140fd7ed svnClientAdapter-1.7.0.tar.gz >diff --git a/svnClientAdapter-1.7.0-build.patch b/svnClientAdapter-1.7.0-build.patch >new file mode 100644 >index 0000000..39a8a7c >--- /dev/null >+++ b/svnClientAdapter-1.7.0-build.patch >@@ -0,0 +1,53 @@ >+diff -Nru svnClientAdapter-1.7.0/build.properties svnClientAdapter-1.7.0-gil/build.properties >+--- svnClientAdapter-1.7.0/build.properties 2012-07-27 16:24:28.000000000 +0200 >++++ svnClientAdapter-1.7.0-gil/build.properties 2012-12-12 12:22:04.737769906 +0100 >+@@ -34,10 +34,10 @@ >+ # ----------------------------------------------------------------------------- >+ # all jar needed >+ # ----------------------------------------------------------------------------- >+-lib.dir=lib >++lib.dir=/usr/share/java >+ svnjavahl.jar=${lib.dir}/svn-javahl.jar >+-svnkit.jar=${lib.dir}/svnkit/svnkit-1.7.5-v1.jar >+-svnkitjavahl.jar=${lib.dir}/svnkit/svnkit-javahl16-1.7.5-v1.jar >++#svnkit.jar=${lib.dir}/svnkit/svnkit-1.7.5-v1.jar >++#svnkitjavahl.jar=${lib.dir}/svnkit/svnkit-javahl16-1.7.5-v1.jar >+ >+ # ----------------------------------------------------------------------------- >+ # JavaHL win32 lib dir >+diff -Nru svnClientAdapter-1.7.0/build.xml svnClientAdapter-1.7.0-gil/build.xml >+--- svnClientAdapter-1.7.0/build.xml 2012-07-27 16:24:28.000000000 +0200 >++++ svnClientAdapter-1.7.0-gil/build.xml 2012-12-12 12:23:20.668790200 +0100 >+@@ -32,12 +32,12 @@ >+ <depend srcDir="${src.javahl.dir}" >+ destDir="${build.classes.dir}" >+ cache="${build.cache.dir}"/> >+- <depend srcDir="${src.svnkit.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}"/> >++ cache="${build.cache.dir}"/--> >+ <javac srcdir="${src.main.dir}" >+ destdir="${build.classes.dir}" >+ debug="${debug}" >+@@ -54,7 +54,7 @@ >+ includes="**" >+ classpathref="project.classpath"> >+ </javac> >+- <javac srcdir="${src.svnkit.dir}" >++ <!--javac srcdir="${src.svnkit.dir}" >+ destdir="${build.classes.dir}" >+ debug="${debug}" >+ source="${targetJvm}" >+@@ -69,7 +69,7 @@ >+ target="${targetJvm}" >+ includes="**" >+ classpathref="project.classpath"> >+- </javac> >++ </javac--> >+ <copy todir="${build.classes.dir}"> >+ <fileset dir="${src.main.dir}"> >+ <exclude name="**/*.java"/> >-- >1.8.0.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 887162
: 663424