[eclipse-rse] Build/install with mvn_build/mvn_install
Mat Booth
mbooth at fedoraproject.org
Fri Sep 26 12:30:12 UTC 2014
commit 93453f0b36a0bda3e75adc574eb01eeb6835daf0
Author: Mat Booth <mat.booth at redhat.com>
Date: Fri Sep 26 13:29:47 2014 +0100
Build/install with mvn_build/mvn_install
- Drop unneeded BR/Rs and patches
- General spec file clean up
.gitignore | 19 +++--------
eclipse-rse-junit.patch | 12 -------
eclipse-rse-tm-repo.patch | 22 -------------
eclipse-rse-top-pom.patch | 44 --------------------------
eclipse-rse.spec | 75 +++++++++++----------------------------------
5 files changed, 23 insertions(+), 149 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 753739d..587b882 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,6 @@
-rse-fetched-src-R3_0_3.tar.gz
-rse-fetched-src-R3_1.tar.gz
-rse-fetched-src-R3_1_1.tar.gz
-rse-fetched-src-R3_1_2.tar.gz
-rse-fetched-src-R3_2.tar.gz
-/rse-fetched-src-R3_3.tar.gz
-/rse-fetched-src-R3_3_1.tar.gz
-/rse-fetched-src-R3_4.tar.gz
-/eclipse-rse-3.5M6.tar.gz
-/S3_5RC3.tar.bz2
-/org.eclipse.tm-R3_5GA.tar.bz2
-/org.eclipse.tm-S3_5_1RC4.tar.bz2
-/org.eclipse.tm-S3_5_1RC4
-/org.eclipse.tm-a3c928622a0ddbd8d7ddde328740020ef1c4f313.tar.bz2
/R3_6.tar.bz2
+/R3_6/
+/*.src.rpm
+/noarch/
+/.build-*.log
+/.project
diff --git a/eclipse-rse-top-pom.patch b/eclipse-rse-top-pom.patch
index 550ae40..bd21513 100644
--- a/eclipse-rse-top-pom.patch
+++ b/eclipse-rse-top-pom.patch
@@ -35,50 +35,6 @@ diff -up ./pom.xml.orig ./pom.xml
</modules>
<build>
<plugins>
-@@ -214,42 +222,7 @@
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
-- <arch>x86</arch>
-- </environment>
-- <environment>
-- <os>linux</os>
-- <ws>gtk</ws>
-- <arch>x86_64</arch>
-- </environment>
-- <environment>
-- <os>linux</os>
-- <ws>gtk</ws>
-- <arch>ppc64</arch>
-- </environment>
-- <environment>
-- <os>win32</os>
-- <ws>win32</ws>
-- <arch>x86</arch>
-- </environment>
-- <environment>
-- <os>win32</os>
-- <ws>win32</ws>
-- <arch>x86_64</arch>
-- </environment>
-- <environment>
-- <os>macosx</os>
-- <ws>cocoa</ws>
-- <arch>x86</arch>
-- </environment>
-- <environment>
-- <os>macosx</os>
-- <ws>cocoa</ws>
-- <arch>x86_64</arch>
-- </environment>
-- <environment>
-- <os>aix</os>
-- <ws>gtk</ws>
-- <arch>ppc</arch>
-+ <arch>noarch</arch>
- </environment>
- </environments>
- <resolver>p2</resolver>
@@ -304,25 +277,8 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
diff --git a/eclipse-rse.spec b/eclipse-rse.spec
index c1f34ef..3d85769 100644
--- a/eclipse-rse.spec
+++ b/eclipse-rse.spec
@@ -1,4 +1,3 @@
-%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
@@ -7,60 +6,31 @@
Name: eclipse-rse
Summary: Eclipse Remote System Explorer
Version: 3.6.0
-#it looks like RC4 was released with kepler without rename.
-Release: 1%{?dist}
+Release: 2%{?dist}
License: EPL
URL: http://www.eclipse.org/dsdp/tm/
Source0: http://git.eclipse.org/c/tm/org.eclipse.tm.git/snapshot/R3_6.tar.bz2
-Source4: notice.html
-Source5: epl-v10.html
# 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-devel >= 1.5.0
-
-# 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: feclipse-maven-plugin
-BuildRequires: maven >= 3.0.3
BuildRequires: eclipse-license
-BuildRequires: junit
-
BuildRequires: eclipse-pde >= 1:3.8.0-0.21
-BuildRequires: eclipse-emf >= 0:2.4.1
-BuildRequires: apache-commons-net >= 0:1.4.1-5.4
+BuildRequires: apache-commons-net
Requires: eclipse-platform >= 1:3.8.0-0.21
-Requires: eclipse-emf >= 0:2.4.1
-Requires: apache-commons-net >= 0:2.0
-
-Group: Development/Tools
+Requires: apache-commons-net
%description
Remote System Explorer (RSE) is a framework and toolkit in Eclipse Workbench
@@ -68,7 +38,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: perl-Authen-PAM
Requires: java-headless
@@ -81,10 +50,6 @@ The Remote System Explorer (RSE) framework server that can be used so clients ca
%patch3 -b .orig
%patch4
-%patch5
-%patch6 -b .orig
-
-sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
pushd rse/plugins/org.eclipse.rse.services.dstore
%patch1
@@ -92,28 +57,20 @@ 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
-xmvn -o -DskipTychoVersionCheck -Dmaven.test.skip=true clean install
+# Not necessary build the p2 repo with mvn_install
+%pom_disable_module releng/org.eclipse.tm.repo
-cp %{SOURCE4} .
-cp %{SOURCE5} .
+%build
+%mvn_build -j
%install
+%mvn_install
-install -d -m 755 %{buildroot}%{_datadir}/eclipse
-install -d -m 755 %{buildroot}%{install_loc}/eclipse
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 %{_javadir}/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
@@ -138,8 +95,8 @@ cp *.properties %{buildroot}%{rseserver_config}
cp *.dat %{buildroot}%{rseserver_install}
popd
-%files
-%{install_loc}
+%files -f .mfiles
+%doc releng/rootfiles/*.html
%files server
%{rseserver_install}
@@ -147,10 +104,14 @@ popd
%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
+* Fri Sep 26 2014 Mat Booth <mat.booth at redhat.com> - 3.6.0-2
+- Build/install with mvn_build/mvn_install
+- Drop unneeded BR/Rs and patches
+- General spec file clean up
+
* Thu Jun 26 2014 Jeff Johnston <jjohnstn at redhat.com> - 3.6.0-1
- Update to Luna release 3.6 final.
More information about the scm-commits
mailing list