From 57ce5bd8cf5e058d6ed71a6defe8cd8b2abc1aac Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Oct 22 2018 13:25:09 +0000 Subject: Update to latest upstream release Unbundle nailgun --- diff --git a/.gitignore b/.gitignore index f2a12a7..56127d9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /javahl-1.9.7.tar.gz /svn-javahl-api-1.6.18-v2-sources.jar /javahl-1.8.1.tar.gz +/org.tmatesoft.svn_1.9.3.src.tar.xz +/javahl-1.9.0.tar.gz diff --git a/LICENSE-1.1.txt b/LICENSE-1.1.txt deleted file mode 100644 index de6706f..0000000 --- a/LICENSE-1.1.txt +++ /dev/null @@ -1,58 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt deleted file mode 100644 index d645695..0000000 --- a/LICENSE-2.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/sources b/sources index 04c01c9..7aad2b9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (org.tmatesoft.svn_1.8.12.src.zip) = fcafd6428ab9f8becb676cc8bb80330d532762dcad91cc306233d67f3eff4183d567688051cea4a3922ae9cc5d52693887e82307e99153e80eaae95e404e4af5 -SHA512 (javahl-1.8.1.tar.gz) = 88abab45f98085456bf539062cebdabff5b14485918a52309bf4da12f49e15dd3b89a4ab09f8add96595684de0740eb0a49faa39ee24583c8985f0900535f2ef +SHA512 (org.tmatesoft.svn_1.9.3.src.tar.xz) = e1660a535faa75af40aa8a17d4e5350f21e4fa941dfa6e1868562d32dcc9377c6b84dac13170918a94317b2c9abff43ae858f4c1d6f0768930926dea5d9a25fb +SHA512 (javahl-1.9.0.tar.gz) = e407d398a971f43f7935164e983b74dfa18f477a04d6731e8227cfa73af186da2125d730375915ecf6bf36f65403aba4f7b84a17f3e31d3db0a46d7ee5239e68 diff --git a/svnkit-1.8.12.pom b/svnkit-1.8.12.pom deleted file mode 100644 index 86a836a..0000000 --- a/svnkit-1.8.12.pom +++ /dev/null @@ -1,77 +0,0 @@ - - - 4.0.0 - org.tmatesoft.svnkit - svnkit - 1.8.12 - SVNKit Library - Pure Java Subversion Library - http://www.svnkit.com/ - - - TMate Open Source License (with dual licensing option) - http://www.svnkit.com/license.html - - - - - tmate - TMate Software - - - - scm:svn:http://svn.svnkit.com/repos/svnkit - http://svn.svnkit.com/repos/svnkit - - - - com.jcraft - jsch.agentproxy.svnkit-trilead-ssh2 - 0.0.7 - compile - - - com.trilead - trilead-ssh2 - 1.0.0-build220 - compile - - - net.java.dev.jna - jna-platform - 4.1.0 - compile - - - net.java.dev.jna - jna - 4.1.0 - compile - - - com.jcraft - jsch.agentproxy.connector-factory - 0.0.7 - compile - - - junit - junit - 4.8 - test - - - de.regnis.q.sequence - sequence-library - 1.0.3 - compile - - - org.tmatesoft.sqljet - sqljet - 1.1.10 - compile - - - diff --git a/svnkit-1.9.3.pom b/svnkit-1.9.3.pom new file mode 100644 index 0000000..1c4305a --- /dev/null +++ b/svnkit-1.9.3.pom @@ -0,0 +1,88 @@ + + + 4.0.0 + org.tmatesoft.svnkit + svnkit + 1.9.3 + SVNKit Java(tm) Subversion Library + Java(tm) library to manage Subversion working copies and repositories + https://svnkit.com/ + + TMate Software + https://svnkit.com/ + + + + TMate Open Source License + https://svnkit.com/license.html + repos + GPL-like license with a dual-licensing option for closed source usage + + + + + alexander.kitaev + Alexander Kitaev + support@svnkit.com + + developer + + + + + scm:svn:https://svn.tmatesoft.com/repos/svnkit + scm:svn:https://svn.tmatesoft.com/repos/svnkit + https://svn.tmatesoft.com/repos/svnkit + + + + de.regnis.q.sequence + sequence-library + 1.0.3 + compile + + + org.tmatesoft.sqljet + sqljet + 1.1.11 + compile + + + net.java.dev.jna + jna + 4.1.0 + compile + + + net.java.dev.jna + jna-platform + 4.1.0 + compile + + + com.trilead + trilead-ssh2 + 1.0.0-build221 + compile + + + com.jcraft + jsch.agentproxy.connector-factory + 0.0.7 + compile + + + com.jcraft + jsch.agentproxy.svnkit-trilead-ssh2 + 0.0.7 + compile + + + junit + junit + 4.8 + test + + + diff --git a/svnkit-cli-1.8.12.pom b/svnkit-cli-1.8.12.pom deleted file mode 100644 index 691b6ce..0000000 --- a/svnkit-cli-1.8.12.pom +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - org.tmatesoft.svnkit - svnkit-cli - 1.8.12 - SVNKit Library - Pure Java Subversion Library - http://www.svnkit.com/ - - - TMate Open Source License (with dual licensing option) - http://www.svnkit.com/license.html - - - - - tmate - TMate Software - - - - scm:svn:http://svn.svnkit.com/repos/svnkit - http://svn.svnkit.com/repos/svnkit - - - - org.tmatesoft.svnkit - svnkit - 1.8.12 - compile - - - diff --git a/svnkit-cli-1.9.3.pom b/svnkit-cli-1.9.3.pom new file mode 100644 index 0000000..04c1594 --- /dev/null +++ b/svnkit-cli-1.9.3.pom @@ -0,0 +1,46 @@ + + + 4.0.0 + org.tmatesoft.svnkit + svnkit-cli + 1.9.3 + SVNKit based Subversion command line client + SVNKit based Subversion command line client + https://svnkit.com/ + + TMate Software + https://svnkit.com/ + + + + TMate Open Source License + https://svnkit.com/license.html + repos + GPL-like license with a dual-licensing option for closed source usage + + + + + alexander.kitaev + Alexander Kitaev + support@svnkit.com + + developer + + + + + scm:svn:https://svn.tmatesoft.com/repos/svnkit + scm:svn:https://svn.tmatesoft.com/repos/svnkit + https://svn.tmatesoft.com/repos/svnkit + + + + org.tmatesoft.svnkit + svnkit + 1.9.3 + compile + + + diff --git a/svnkit-javahl16-1.8.12.pom b/svnkit-javahl16-1.8.12.pom deleted file mode 100644 index f7353e3..0000000 --- a/svnkit-javahl16-1.8.12.pom +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - org.tmatesoft.svnkit - svnkit-javahl16 - 1.8.12 - SVNKit Library - Pure Java Subversion Library - http://www.svnkit.com/ - - - TMate Open Source License (with dual licensing option) - http://www.svnkit.com/license.html - - - - - tmate - TMate Software - - - - scm:svn:http://svn.svnkit.com/repos/svnkit - http://svn.svnkit.com/repos/svnkit - - - - org.tmatesoft.svnkit - svnkit - 1.8.12 - compile - - - org.apache.subversion - svn-javahl-api - 1.8.1 - compile - - - org.apache.subversion - svn-javahl-tests - 1.8.1 - test - - - diff --git a/svnkit-javahl16-1.9.3.pom b/svnkit-javahl16-1.9.3.pom new file mode 100644 index 0000000..ec0b9cd --- /dev/null +++ b/svnkit-javahl16-1.9.3.pom @@ -0,0 +1,58 @@ + + + 4.0.0 + org.tmatesoft.svnkit + svnkit-javahl16 + 1.9.3 + SVNKit Java(tm) Subversion JavaHL API implementation + SVNKit Java(tm) Subversion JavaHL API implementation + https://svnkit.com/ + + TMate Software + https://svnkit.com/ + + + + TMate Open Source License + https://svnkit.com/license.html + repos + GPL-like license with a dual-licensing option for closed source usage + + + + + alexander.kitaev + Alexander Kitaev + support@svnkit.com + + developer + + + + + scm:svn:https://svn.tmatesoft.com/repos/svnkit + scm:svn:https://svn.tmatesoft.com/repos/svnkit + https://svn.tmatesoft.com/repos/svnkit + + + + org.tmatesoft.svnkit + svnkit + 1.9.3 + compile + + + org.apache.subversion + svn-javahl-api + 1.9.3-SNAPSHOT + compile + + + org.apache.subversion + svn-javahl-tests + 1.9.3-SNAPSHOT + test + + + diff --git a/svnkit.spec b/svnkit.spec index 669aa65..dc7710b 100644 --- a/svnkit.spec +++ b/svnkit.spec @@ -1,16 +1,23 @@ # The version of Subversion that we are compatible with -%global svn_version 1.8.1 +%global svn_version 1.9.0 Epoch: 1 Name: svnkit -Version: 1.8.12 -Release: 4%{?dist} +Version: 1.9.3 +Release: 1%{?dist} Summary: Pure Java library to manage Subversion working copies and repositories # License located at https://svnkit.com/license.html +# SVNKit is "TMate" license and the JavaHL bindings we use at build-time are "ASL 2.0" License: TMate and ASL 2.0 URL: https://www.svnkit.com/ -Source0: https://www.svnkit.com/org.tmatesoft.svn_%{version}.src.zip +# This source is downloaded from: https://www.svnkit.com/org.tmatesoft.svn_%%{version}.src.zip +# But re-compressed with bundled version of nailgun removed, e.g.: +# $ wget https://www.svnkit.com/org.tmatesoft.svn_1.9.3.src.zip +# $ unzip org.tmatesoft.svn_1.9.3.src.zip +# $ rm -rf svnkit-1.9.3/svnkit-test/nailgun/ +# $ tar caf org.tmatesoft.svn_1.9.3.src.tar.xz svnkit-1.9.3/ +Source0: org.tmatesoft.svn_%{version}.src.tar.xz # POMs Source1: http://repo1.maven.org/maven2/org/tmatesoft/svnkit/svnkit/%{version}/svnkit-%{version}.pom @@ -22,13 +29,10 @@ Source4: svnkit-parent.pom # SVNKit provides a pure-Java implementation of the Subversion JavaHL API, but it only provides an older # Subversion JavaHL API, so we need an old version of the JavaHL source to build against. This is that: -# $ svn export https://svn.apache.org/repos/asf/subversion/tags/1.8.1/subversion/bindings/javahl/src/ javahl-1.8.1 +# $ svn export https://svn.apache.org/repos/asf/subversion/tags/1.9.0/subversion/bindings/javahl/src/ javahl-1.9.0 +# $ tar caf javahl-1.9.0.tar.gz javahl-1.9.0/ Source5: javahl-%{svn_version}.tar.gz -# Just in SRPM due to nailgun comes included in svnkit upstream sources: -Source10: https://www.apache.org/licenses/LICENSE-2.0.txt -Source11: https://www.apache.org/licenses/LICENSE-1.1.txt - # svnkit's trilead-ssh2 does not throw InterruptedException from Session.waitForCondition() # Fedora's trilead-ssh2 trhows ... Patch1: svnkit-1.8.5-SshSession-unreported-exception.patch @@ -125,7 +129,8 @@ for class in SVN SVNAdmin SVNDumpFilter SVNLook SVNSync SVNVersion ; do done %files -f .mfiles-svnkit -%license LICENSE.txt README.txt CHANGES.txt +%license LICENSE.txt +%doc README.txt CHANGES.txt %files cli -f .mfiles-svnkit-cli %{_bindir}/* @@ -136,6 +141,10 @@ done %license LICENSE.txt %changelog +* Mon Oct 22 2018 Mat Booth - 1:1.9.3-1 +- Update to latest upstream release +- Unbundle nailgun + * Fri Aug 31 2018 Severin Gehwolf - 1:1.8.12-4 - Add explicit javapackages-tools requirement to -cli sub-package for scripts using java-functions. See RHBZ#1600426.