[eclipse-rse] Use apache-commons-net instead of jakarta-commons-net.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed May 2 18:49:31 UTC 2012
commit 35a2681ec896cc7f2a8ba0c5529b70d5d2d18555
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed May 2 21:49:13 2012 +0300
Use apache-commons-net instead of jakarta-commons-net.
- Drop old stuff.
eclipse-rse.spec | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/eclipse-rse.spec b/eclipse-rse.spec
index aa8ad97..439ef75 100644
--- a/eclipse-rse.spec
+++ b/eclipse-rse.spec
@@ -1,7 +1,6 @@
%if 0%{?rhel} >= 6
%global debug_package %{nil}
%endif
-%global eclipse_base %{_libdir}/eclipse
%global install_loc %{_datadir}/eclipse/dropins
%global rseserver_install %{_datadir}/eclipse-rse-server
%global rseserver_java %{_datadir}/java/eclipse-rse-server
@@ -10,7 +9,7 @@
Name: eclipse-rse
Summary: Eclipse Remote System Explorer
Version: 3.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: EPL
URL: http://www.eclipse.org/dsdp/tm/
@@ -29,8 +28,6 @@ Patch1: eclipse-rse-server-auth-pl.patch
# to install locations
Patch2: eclipse-rse-server-scripts.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildRequires: java-devel >= 1.5.0
%if 0%{?rhel} >= 6
@@ -41,10 +38,10 @@ BuildArch: noarch
BuildRequires: eclipse-pde >= 1:3.8.0-0.21
BuildRequires: eclipse-emf >= 0:2.4.1
-BuildRequires: jakarta-commons-net >= 0:1.4.1-5.4
+BuildRequires: apache-commons-net >= 0:1.4.1-5.4
Requires: eclipse-platform >= 1:3.8.0-0.21
Requires: eclipse-emf >= 0:2.4.1
-Requires: jakarta-commons-net >= 0:2.0
+Requires: apache-commons-net >= 0:2.0
Group: Development/Tools
@@ -98,7 +95,6 @@ popd
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DgenerateFeatureVersionSuffix=true" -j -DJ2SE_1.5=%{_jvmdir}/java/jre/lib/rt.jar -o `pwd`/orbitdeps
%install
-rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{_datadir}/eclipse
install -d -m 755 %{buildroot}%{install_loc}/rse
install -d -m 755 %{buildroot}%{rseserver_install}
@@ -145,17 +141,12 @@ cp *.dat %{buildroot}%{rseserver_install}
popd
popd
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{install_loc}/rse
%doc org.eclipse.rse.sdk-feature/epl-v10.html
%doc org.eclipse.rse.sdk-feature/license.html
%files server
-%defattr(-,root,root,-)
%{rseserver_install}
%{rseserver_java}
%{rseserver_config}
@@ -165,6 +156,10 @@ rm -rf %{buildroot}
%doc epl-v10.html
%changelog
+* Wed May 2 2012 Alexander Kurtakov <akurtako at redhat.com> 3.3.1-2
+- Use apache-commons-net instead of jakarta-commons-net.
+- Drop old stuff.
+
* Mon Apr 02 2012 Jeff Johnston <jjohnstn at redhat.com> - 3.3.1-1
- Update to RSE 3.3.1
More information about the scm-commits
mailing list