[eclipse-ptp/el6] Revert "Fixup some dependencies"
Orion Poplawski
orion at fedoraproject.org
Tue Sep 6 18:23:52 UTC 2011
commit 4a9c327076a61275e1d2759b3cbf9f3b1e79c96d
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Tue Sep 6 12:19:47 2011 -0600
Revert "Fixup some dependencies"
This reverts commit 7aa01b12f250c4262e4b43d48a94444e0626abb6.
eclipse-ptp.spec | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 417baf6..a7db628 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -12,7 +12,7 @@ Summary: Eclipse Parallel Tools Platform
Name: eclipse-ptp
# Be sure to update photran version if needed
Version: %{ptpver}
-Release: 2%{?dist}
+Release: 1%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/ptp
@@ -25,24 +25,22 @@ Source2: cdtdb-4.0.3-eclipse.jar
Source3: finddeps.sh
# Remove some unneeded dependencies
Patch0: eclipse-ptp-deps.patch
-BuildRequires: java-devel >= 1.5.0
-BuildRequires: eclipse-pde >= %{pdereq}
-BuildRequires: eclipse-cdt-parsers >= %{cdtreq}
+BuildRequires: java-devel >= 1.5.0
+BuildRequires: eclipse-pde >= %{pdereq}
+BuildRequires: eclipse-cdt-parsers >= %{cdtreq}
#BuildRequires: eclipse-cdt-tests
# >= 1:6.0.2
-BuildRequires: eclipse-jgit
-BuildRequires: eclipse-rse >= %{rsereq}
-BuildRequires: lpg-java-compat = 1.1.0
-BuildRequires: ws-jaxme
+BuildRequires: eclipse-jgit
+BuildRequires: eclipse-rse >= %{rsereq}
+BuildRequires: lpg-java-compat = 1.1.0
+BuildRequires: ws-jaxme
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
-Requires: eclipse-cdt >= %{cdtreq}
+Requires: eclipse-cdt >= %{cdtreq}
# Pulled in by rdt.remotetools being in ptp main
-Requires: %{name}-rdt = %{version}-%{release}
-Provides: %{name}-rdt-remotetools = %{version}-%{release}
-Obsoletes: %{name}-rdt-remotetools < %{version}-%{release}
+Requires: %{name}-rdt = %{version}-%{release}
%description
The aim of the parallel tools platform project is to produce an open-source
@@ -158,6 +156,8 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: eclipse-jgit
Requires: eclipse-rse >= %{rsereq}
+Provides: %{name}-rdt-remotetools = %{version}-%{release}
+Obsoletes: %{name}-rdt-remotetools < %{version}-%{release}
BuildArch: noarch
%description rdt
@@ -166,7 +166,8 @@ PTP components for supporting Remote Development Tools.
%package rdt-sync
Summary: PTP Remote Synchronization Support
Group: Development/Libraries
-Requires: eclipse-jgit
+Requires: %{name}-rdt = %{version}-%{release}
+Requires: eclipse-cdt-parsers >= %{cdtreq}
BuildArch: noarch
%description rdt-sync
@@ -411,9 +412,6 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
-* Tue Sep 6 2011 Orion Poplawski <orion at cora.nwra.com> - 5.0.1-2
-- Fixup some dependencies
-
* Wed Aug 31 2011 Orion Poplawski <orion at cora.nwra.com> - 5.0.1-1
- Update to PTP 5.0.1, photran 7.0.1
- Bump CDT and PDE requirement
More information about the scm-commits
mailing list