From 0ee3bda29bc67042f14315731d164c70ca56bde8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 23 2015 07:37:48 +0000 Subject: import devtoolset-3-eclipse-rse-3.6.0-8.el7 --- diff --git a/.devtoolset-3-eclipse-rse.metadata b/.devtoolset-3-eclipse-rse.metadata index 77a09f1..bbfa301 100644 --- a/.devtoolset-3-eclipse-rse.metadata +++ b/.devtoolset-3-eclipse-rse.metadata @@ -1 +1 @@ -18d0dc512bad03a03107a794d8a45b9d6939f3b4 SOURCES/org.eclipse.tm-R3_6.tar.bz2 +b92202066892ee7d40d55f8b89c3b99fb7d68bec SOURCES/R3_6.tar.bz2 diff --git a/.gitignore b/.gitignore index 4cb476c..cc73448 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/org.eclipse.tm-R3_6.tar.bz2 +SOURCES/R3_6.tar.bz2 diff --git a/SOURCES/eclipse-rse-junit.patch b/SOURCES/eclipse-rse-junit.patch deleted file mode 100644 index 3b8dfe6..0000000 --- a/SOURCES/eclipse-rse-junit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./rse/tests/org.eclipse.rse.tests-feature/feature.xml.fix3 ./rse/tests/org.eclipse.rse.tests-feature/feature.xml ---- ./rse/tests/org.eclipse.rse.tests-feature/feature.xml.fix3 2013-04-04 15:09:58.000000000 -0400 -+++ ./rse/tests/org.eclipse.rse.tests-feature/feature.xml 2013-04-04 15:10:20.000000000 -0400 -@@ -47,7 +47,7 @@ - - - -- -+ - - - diff --git a/SOURCES/eclipse-rse-tm-repo.patch b/SOURCES/eclipse-rse-tm-repo.patch deleted file mode 100644 index 39d397c..0000000 --- a/SOURCES/eclipse-rse-tm-repo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up ./releng/org.eclipse.tm.repo/category.xml.fix ./releng/org.eclipse.tm.repo/category.xml ---- ./releng/org.eclipse.tm.repo/category.xml.fix 2014-05-21 12:47:45.977219186 -0400 -+++ ./releng/org.eclipse.tm.repo/category.xml 2014-05-21 12:54:56.700518704 -0400 -@@ -15,6 +15,10 @@ - - - -+ -+ -+ -+ - - - diff --git a/SOURCES/eclipse-rse-top-pom.patch b/SOURCES/eclipse-rse-top-pom.patch index 550ae40..bd21513 100644 --- a/SOURCES/eclipse-rse-top-pom.patch +++ b/SOURCES/eclipse-rse-top-pom.patch @@ -35,50 +35,6 @@ diff -up ./pom.xml.orig ./pom.xml -@@ -214,42 +222,7 @@ - - linux - gtk -- x86 -- -- -- linux -- gtk -- x86_64 -- -- -- linux -- gtk -- ppc64 -- -- -- win32 -- win32 -- x86 -- -- -- win32 -- win32 -- x86_64 -- -- -- macosx -- cocoa -- x86 -- -- -- macosx -- cocoa -- x86_64 -- -- -- aix -- gtk -- ppc -+ noarch - - - p2 @@ -304,25 +277,8 @@ org.eclipse.tycho tycho-packaging-plugin diff --git a/SOURCES/epl-v10.html b/SOURCES/epl-v10.html deleted file mode 100644 index 9321f40..0000000 --- a/SOURCES/epl-v10.html +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - -Eclipse Public License - Version 1.0 - - - -

Eclipse Public License - v 1.0

- -

THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE -PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR -DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS -AGREEMENT.

- -

1. DEFINITIONS

- -

"Contribution" means:

- -

a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and

-

b) in the case of each subsequent Contributor:

-

i) changes to the Program, and

-

ii) additions to the Program;

-

where such changes and/or additions to the Program -originate from and are distributed by that particular Contributor. A -Contribution 'originates' from a Contributor if it was added to the -Program by such Contributor itself or anyone acting on such -Contributor's behalf. Contributions do not include additions to the -Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) -are not derivative works of the Program.

- -

"Contributor" means any person or entity that distributes -the Program.

- -

"Licensed Patents" mean patent claims licensable by a -Contributor which are necessarily infringed by the use or sale of its -Contribution alone or when combined with the Program.

- -

"Program" means the Contributions distributed in accordance -with this Agreement.

- -

"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.

- -

2. GRANT OF RIGHTS

- -

a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to reproduce, prepare derivative works -of, publicly display, publicly perform, distribute and sublicense the -Contribution of such Contributor, if any, and such derivative works, in -source code and object code form.

- -

b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free patent license under Licensed Patents to make, use, sell, -offer to sell, import and otherwise transfer the Contribution of such -Contributor, if any, in source code and object code form. This patent -license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, -such addition of the Contribution causes such combination to be covered -by the Licensed Patents. The patent license shall not apply to any other -combinations which include the Contribution. No hardware per se is -licensed hereunder.

- -

c) Recipient understands that although each Contributor -grants the licenses to its Contributions set forth herein, no assurances -are provided by any Contributor that the Program does not infringe the -patent or other intellectual property rights of any other entity. Each -Contributor disclaims any liability to Recipient for claims brought by -any other entity based on infringement of intellectual property rights -or otherwise. As a condition to exercising the rights and licenses -granted hereunder, each Recipient hereby assumes sole responsibility to -secure any other intellectual property rights needed, if any. For -example, if a third party patent license is required to allow Recipient -to distribute the Program, it is Recipient's responsibility to acquire -that license before distributing the Program.

- -

d) Each Contributor represents that to its knowledge it -has sufficient copyright rights in its Contribution, if any, to grant -the copyright license set forth in this Agreement.

- -

3. REQUIREMENTS

- -

A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:

- -

a) it complies with the terms and conditions of this -Agreement; and

- -

b) its license agreement:

- -

i) effectively disclaims on behalf of all Contributors -all warranties and conditions, express and implied, including warranties -or conditions of title and non-infringement, and implied warranties or -conditions of merchantability and fitness for a particular purpose;

- -

ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;

- -

iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and

- -

iv) states that source code for the Program is available -from such Contributor, and informs licensees how to obtain it in a -reasonable manner on or through a medium customarily used for software -exchange.

- -

When the Program is made available in source code form:

- -

a) it must be made available under this Agreement; and

- -

b) a copy of this Agreement must be included with each -copy of the Program.

- -

Contributors may not remove or alter any copyright notices contained -within the Program.

- -

Each Contributor must identify itself as the originator of its -Contribution, if any, in a manner that reasonably allows subsequent -Recipients to identify the originator of the Contribution.

- -

4. COMMERCIAL DISTRIBUTION

- -

Commercial distributors of software may accept certain -responsibilities with respect to end users, business partners and the -like. While this license is intended to facilitate the commercial use of -the Program, the Contributor who includes the Program in a commercial -product offering should do so in a manner which does not create -potential liability for other Contributors. Therefore, if a Contributor -includes the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and -indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") -arising from claims, lawsuits and other legal actions brought by a third -party against the Indemnified Contributor to the extent caused by the -acts or omissions of such Commercial Contributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In -order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the -Commercial Contributor to control, and cooperate with the Commercial -Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own -expense.

- -

For example, a Contributor might include the Program in a commercial -product offering, Product X. That Contributor is then a Commercial -Contributor. If that Commercial Contributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility -alone. Under this section, the Commercial Contributor would have to -defend claims against the other Contributors related to those -performance claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor -must pay those damages.

- -

5. NO WARRANTY

- -

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -PROVIDED 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. Each Recipient is solely -responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to -the risks and costs of program errors, compliance with applicable laws, -damage to or loss of data, programs or equipment, and unavailability or -interruption of operations.

- -

6. DISCLAIMER OF LIABILITY

- -

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT -NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING -WITHOUT LIMITATION LOST PROFITS), 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 OR -DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED -HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

- -

7. GENERAL

- -

If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further action -by the parties hereto, such provision shall be reformed to the minimum -extent necessary to make such provision valid and enforceable.

- -

If Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other -software or hardware) infringes such Recipient's patent(s), then such -Recipient's rights granted under Section 2(b) shall terminate as of the -date such litigation is filed.

- -

All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of time -after becoming aware of such noncompliance. If all Recipient's rights -under this Agreement terminate, Recipient agrees to cease use and -distribution of the Program as soon as reasonably practicable. However, -Recipient's obligations under this Agreement and any licenses granted by -Recipient relating to the Program shall continue and survive.

- -

Everyone is permitted to copy and distribute copies of this -Agreement, but in order to avoid inconsistency the Agreement is -copyrighted and may only be modified in the following manner. The -Agreement Steward reserves the right to publish new versions (including -revisions) of this Agreement from time to time. No one other than the -Agreement Steward has the right to modify this Agreement. The Eclipse -Foundation is the initial Agreement Steward. The Eclipse Foundation may -assign the responsibility to serve as the Agreement Steward to a -suitable separate entity. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version -of the Agreement is published, Contributor may elect to distribute the -Program (including its Contributions) under the new version. Except as -expressly stated in Sections 2(a) and 2(b) above, Recipient receives no -rights or licenses to the intellectual property of any Contributor under -this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this -Agreement are reserved.

- -

This Agreement is governed by the laws of the State of New York and -the intellectual property laws of the United States of America. No party -to this Agreement will bring a legal action under this Agreement more -than one year after the cause of action arose. Each party waives its -rights to a jury trial in any resulting litigation.

- - \ No newline at end of file diff --git a/SOURCES/notice.html b/SOURCES/notice.html deleted file mode 100644 index f19c483..0000000 --- a/SOURCES/notice.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -Eclipse Foundation Software User Agreement - - - -

Eclipse Foundation Software User Agreement

-

February 1, 2011

- -

Usage Of Content

- -

THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.

- -

Applicable Licenses

- -

Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. - For purposes of the EPL, "Program" will mean the Content.

- -

Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").

- -
    -
  • Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
    • -
  • Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
    • -
  • A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.
    • -
  • Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
    • -
- -

The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:

- -
    -
  • The top-level (root) directory
    • -
  • Plug-in and Fragment directories
    • -
  • Inside Plug-ins and Fragments packaged as JARs
    • -
  • Sub-directories of the directory named "src" of certain Plug-ins
    • -
  • Feature directories
    • -
- -

Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.

- -

THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):

- - - -

IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.

- - -

Use of Provisioning Technology

- -

The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html - ("Specification").

- -

You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:

- -
    -
  1. A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.
    2. -
  2. During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.
    3. -
  3. Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
    4. -
- -

Cryptography

- -

Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.

- -

Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.

- - diff --git a/SPECS/eclipse-rse.spec b/SPECS/eclipse-rse.spec index 4b3ca80..5df44c0 100644 --- a/SPECS/eclipse-rse.spec +++ b/SPECS/eclipse-rse.spec @@ -1,69 +1,41 @@ %{?scl:%scl_package eclipse-rse} %{!?scl:%global pkg_name %{name}} -%{!?maven_scl:%global maven_scl_prefix %{nil}} -%global install_loc %{_datadir}/eclipse/dropins/rse %global rseserver_install %{_datadir}/eclipse-rse-server %global rseserver_java %{_datadir}/java/eclipse-rse-server %global rseserver_config %{_sysconfdir}/sysconfig/rseserver -%global rse_snapshot org.eclipse.tm -%global rse_tag R3_6 +%global rse_snapshot R3_6 + +%{?java_common_find_provides_and_requires} Name: %{?scl_prefix}eclipse-rse Summary: Eclipse Remote System Explorer -Version: 3.6 -Release: 4%{?dist} +Version: 3.6.0 +Release: 8%{?dist} License: EPL URL: http://www.eclipse.org/dsdp/tm/ -Source0: http://git.eclipse.org/c/tm/org.eclipse.tm.git/snapshot/org.eclipse.tm-%{rse_tag}.tar.bz2 -Source4: notice.html -Source5: epl-v10.html +Source0: http://git.eclipse.org/c/tm/org.eclipse.tm.git/snapshot/R3_6.tar.bz2 # Use Authen::pam to authenticate clients Patch1: eclipse-rse-server-auth-pl.patch # Fix classpath in daemon and server scripts to point # to install locations Patch2: eclipse-rse-server-scripts.patch -# Patch to remove eclipse-parent pom reference and multiple environments +# Patch to remove dependency on jgit for tycho-packaging-plugin Patch3: eclipse-rse-top-pom.patch # Patch to remove dependency on org.apache.commons.net.source Patch4: eclipse-rse-commons-net-source.patch -# Patch to allow junit4 to be used for building tests -Patch5: eclipse-rse-junit.patch -# Patch to remove tests from tm repo -Patch6: eclipse-rse-tm-repo.patch - -BuildRequires: java-1.7.0-openjdk-devel -# All arches line up except i386 -> x86 -%ifarch %{ix86} -%define eclipse_arch x86 -%else -%ifarch %{arm} -%define eclipse_arch arm -%else -%define eclipse_arch %{_arch} -%endif -%endif BuildArch: noarch -BuildRequires: tycho -BuildRequires: tycho-extras -BuildRequires: %{maven_scl_prefix}maven-clean-plugin -BuildRequires: %{?scl_prefix}objectweb-asm -BuildRequires: %{?scl_prefix}feclipse-maven-plugin -BuildRequires: junit - -BuildRequires: %{?scl_prefix}eclipse-pde >= 1:3.8.0-0.21 -BuildRequires: %{?scl_prefix}eclipse-emf-core >= 0:2.4.1 +BuildRequires: %{?scl_prefix}tycho +BuildRequires: %{?scl_prefix}tycho-extras BuildRequires: %{?scl_prefix}eclipse-license -BuildRequires: apache-commons-net +BuildRequires: %{?scl_prefix}eclipse-pde >= 1:3.8.0-0.21 +BuildRequires: %{?scl_prefix_java_common}apache-commons-net Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0-0.21 -Requires: %{?scl_prefix}eclipse-emf-core >= 0:2.4.1 -Requires: apache-commons-net >= 0:2.0 - -Group: Development/Tools +Requires: %{?scl_prefix_java_common}apache-commons-net %description Remote System Explorer (RSE) is a framework and toolkit in Eclipse Workbench @@ -71,7 +43,6 @@ that allows you to connect and work with a variety of remote systems. %package server Summary: Eclipse Remote System Explorer Server -Group: Development/Tools Requires: perl Requires: %{?scl_prefix}perl-Authen-PAM Requires: java @@ -80,14 +51,10 @@ Requires: java The Remote System Explorer (RSE) framework server that can be used so clients can connect to this machine via RSE. %prep -%setup -q -n org.eclipse.tm-%{rse_tag} +%setup -q -n %{rse_snapshot} -%patch3 +%patch3 -b .orig %patch4 -%patch5 -%patch6 - -sed -i -e 's/x86<\/arch>/%{eclipse_arch}<\/arch>/g' pom.xml pushd rse/plugins/org.eclipse.rse.services.dstore %patch1 @@ -95,32 +62,29 @@ pushd rse/plugins/org.eclipse.rse.services.dstore popd sed -i -e 's|3.2,3.3|3.2,3.9|g' pom.xml -%build +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +# Not necessary build the p2 repo with mvn_install +%pom_disable_module releng/org.eclipse.tm.repo +%{?scl:EOF} -export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" -scl enable %{scl} - <<"EOF" -xmvn -o -DskipTychoVersionCheck -Dmaven.test.skip=true clean install -EOF +# Fix pom versions +sed -i -e 's@\.qualifier@-SNAPSHOT@' $(find -name pom.xml) -cp %{SOURCE4} . -cp %{SOURCE5} . +%build +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_build -j +%{?scl:EOF} %install -scl enable %{scl} - <<"EOF" -install -d -m 755 %{buildroot}%{_datadir}/eclipse -install -d -m 755 %{buildroot}%{install_loc}/eclipse +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_install +%{?scl:EOF} + install -d -m 755 %{buildroot}%{rseserver_install} install -d -m 755 %{buildroot}%{rseserver_java} install -d -m 755 %{buildroot}%{rseserver_config} -xmvn -o org.fedoraproject:feclipse-maven-plugin:install -DsourceRepo=releng/org.eclipse.tm.repo/target/repository -DtargetLocation=%{buildroot}%{install_loc}/eclipse - -pushd %{buildroot}%{install_loc}/eclipse/plugins -rm org.apache.commons.net_*.jar -ln -s %{_root_datadir}/java/commons-net.jar org.apache.commons.net.jar -popd - -pushd %{buildroot}%{install_loc}/eclipse/plugins +pushd %{buildroot}%{_datadir}/eclipse/dropins/rse/eclipse/plugins unzip -q -o -d %{buildroot}%{rseserver_java} org.eclipse.rse.services.dstore_*.jar dstore_miners.jar unzip -q -o -d %{buildroot}%{rseserver_java} org.eclipse.dstore.core_*.jar dstore_core.jar unzip -q -o -d %{buildroot}%{rseserver_java} org.eclipse.dstore.extra_*.jar dstore_extra_server.jar @@ -144,12 +108,9 @@ pushd serverruntime/data cp *.properties %{buildroot}%{rseserver_config} cp *.dat %{buildroot}%{rseserver_install} popd -EOF -%files -%{install_loc} -%doc releng/rootfiles/epl-v10.html -%doc releng/rootfiles/notice.html +%files -f .mfiles +%doc releng/rootfiles/*.html %files server %{rseserver_install} @@ -157,39 +118,59 @@ EOF %dir %{rseserver_config} %config(noreplace) %{rseserver_config}/ssl.properties %config(noreplace) %{rseserver_config}/rsecomm.properties -%doc notice.html -%doc epl-v10.html +%doc releng/rootfiles/*.html %changelog -* Wed Jul 16 2014 Sami Wagiaalla 3.6-4 -- Remove R on devtoolset-3-apache-commons-net which does not exist. +* Wed Jan 21 2015 Mat Booth - 3.6.0-8 +- Resolves: rhbz#1183921 - java-headless unsatisfiable on el6 + +* Tue Jan 20 2015 Mat Booth - 3.6.0-7 +- Resolves: rhbz#1183921 - java-headless unsatisfiable on el6 + +* Wed Jan 14 2015 Roland Grunberg - 3.6.0-6 +- Generate provides and requires. + +* Tue Jan 13 2015 Roland Grunberg - 3.6.0-5 +- Minor changes to build SCL-ized. -* Tue Jul 15 2014 Sami Wagiaalla 3.6-2 -- Rebuild with apache-commons-net fix. +* Thu Dec 11 2014 Mat Booth - 3.6.0-4 +- Fix artifact versions in pom files -* Mon Jul 14 2014 Jeff Johnston 3.6-1 -- Update to Luna SR0 (RSE 3.6) +* Thu Nov 06 2014 Mat Booth - 3.6.0-3 +- Rebuild to regenerate auto provides/requires -* Tue Jun 3 2014 Alexander Kurtakov 3.6-0.4.RC1 -- Use feclipse-maven-plugin to install. +* Fri Sep 26 2014 Mat Booth - 3.6.0-2 +- Build/install with mvn_build/mvn_install +- Drop unneeded BR/Rs and patches +- General spec file clean up -* Wed May 28 2014 Jeff Johnston 3.6-0.3.RC1 -- Fix link to commons-net.jar +* Thu Jun 26 2014 Jeff Johnston - 3.6.0-1 +- Update to Luna release 3.6 final. -* Wed May 21 2014 Jeff Johnston 3.6-0.2.RC1 -- Fix Requires for apache-commons-net +* Sat Jun 07 2014 Fedora Release Engineering - 3.6.0-0.2.RC1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Wed May 21 2014 Jeff Johnston 3.6-0.1.RC1 -- Update to 3.6 RC1 +* Tue Jun 3 2014 Alexander Kurtakov 3.6.0-0.1.RC1 +- Update to 3.6.0 RC. -* Mon May 19 2014 Jeff Johnston 3.5.1-0.2.RC4 -- Use maven_scl_prefix for maven BuildRequires +* Tue Jun 3 2014 Alexander Kurtakov 3.5.1-0.3.RC4 +- Use feclipse-maven-plugin to have features unzipped. +- Simplify spec a bit. -* Thu Oct 10 2013 Jeff Johnston 3.5.1-0.1.RC4 -- Update to 3.5.1 RC4 used for Kepler SR1 +* Fri Mar 28 2014 Michael Simacek - 3.5.1-0.2.RC4 +- Use Requires: java-headless rebuild (#1067528) -* Wed Oct 9 2013 Krzysztof Daniel 3.5-2 -- Update to Kepler SR1 +* Tue Oct 1 2013 Krzysztof Daniel 3.5.1-0.1.RC4 +- Update to Kepler SR1 RC4. + +* Tue Oct 1 2013 Krzysztof Daniel 3.5.1-1 +- Update to latest upstream. + +* Mon Aug 5 2013 Krzysztof Daniel 3.5-3 +- Fix FTBFS. + +* Sat Aug 03 2013 Fedora Release Engineering - 3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild * Mon Jul 1 2013 Alexander Kurtakov 3.5-1 - Update to Kepler final. @@ -197,28 +178,21 @@ EOF * Fri Jun 7 2013 Alexander Kurtakov 3.5-0.4.rc3 - Update to Kepler RC3. -* Wed Apr 10 2013 Alexander Kurtakov 3.5-0.3.m6 -- Dependency on auth pam needs to be scl-ized too. +* Wed Apr 10 2013 Jeff Johnston 3.5-0.3.m6 +- Add terminal view feature to category.xml. -* Wed Apr 10 2013 Alexander Kurtakov 3.5-0.2.m6 -- Build against sclized apache-commons-net. -- Fix features to install in features folder. +* Tue Apr 09 2013 Jeff Johnston 3.5-0.2.m6 +- Build terminal view feature. * Fri Apr 05 2013 Jeff Johnston 3.5-0.1.m6 - Update rse to 3.5M6 which is what was shipped for Kepler M6. - Need to use full git tree and tycho to build. -* Tue Jan 8 2013 Krzysztof Daniel 3.4-7 -- Require sclized perl auth. - -* Wed Dec 12 2012 Roland Grunberg 3.4-6 -- Change from ExclusiveArch to BuildArch noarch. - -* Wed Dec 12 2012 Krzysztof Daniel 3.4-5 -- Depend on SCLized apache-commons-net. +* Thu Feb 21 2013 Alexander Kurtakov 3.4-5 +- Strip version from commons-net symlink. -* Thu Nov 29 2012 Alexander Kurtakov 3.4-4 -- SCL-ize. +* Wed Feb 13 2013 Fedora Release Engineering - 3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild * Wed Jul 18 2012 Fedora Release Engineering - 3.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild