Rebuild to reflect shape change of ecf and emf packages.
This commit is contained in:
parent
049ca94a64
commit
dc9f536855
1
.gitignore
vendored
1
.gitignore
vendored
@ -47,3 +47,4 @@ eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
|
|||||||
/.xmvn
|
/.xmvn
|
||||||
/R4_platform-aggregator-2caa8794a57a9479ad642d7f6e3607a020aa36e0.tar.bz2
|
/R4_platform-aggregator-2caa8794a57a9479ad642d7f6e3607a020aa36e0.tar.bz2
|
||||||
/eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz
|
/eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz
|
||||||
|
/eclipse-build-60a5a559fd746d946d869720c889bc698d9e6ab3.tar.xz
|
||||||
|
16
eclipse.spec
16
eclipse.spec
@ -9,7 +9,7 @@ Epoch: 1
|
|||||||
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
|
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
|
||||||
%global eclipse_micro 0
|
%global eclipse_micro 0
|
||||||
%global initialize 1
|
%global initialize 1
|
||||||
%global eb_commit b963e34cbd5ead603a051b7d4b79fc91114ccd87
|
%global eb_commit 60a5a559fd746d946d869720c889bc698d9e6ab3
|
||||||
%global eclipse_tag 84cba7bf43da88dc3f33bc113104eb680f12aa2d
|
%global eclipse_tag 84cba7bf43da88dc3f33bc113104eb680f12aa2d
|
||||||
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
|
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
|
||||||
%global installation_loc %{_libdir}/%{pkg_name}
|
%global installation_loc %{_libdir}/%{pkg_name}
|
||||||
@ -51,7 +51,7 @@ fi;
|
|||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: %{?scl_prefix}eclipse
|
Name: %{?scl_prefix}eclipse
|
||||||
Version: %{eclipse_version}
|
Version: %{eclipse_version}
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -173,8 +173,8 @@ BuildRequires: xml-commons-apis >= 1.4.01-12
|
|||||||
BuildRequires: atinject >= 1-6
|
BuildRequires: atinject >= 1-6
|
||||||
BuildRequires: tycho >= 0.16
|
BuildRequires: tycho >= 0.16
|
||||||
BuildRequires: tycho-extras >= 0.16
|
BuildRequires: tycho-extras >= 0.16
|
||||||
BuildRequires: eclipse-emf-core >= 1:2.8.1
|
BuildRequires: eclipse-emf-core >= 1:2.9.0-0.2
|
||||||
BuildRequires: %{?scl_prefix}eclipse-ecf-core
|
BuildRequires: %{?scl_prefix}eclipse-ecf-core >= 3.6.0-2
|
||||||
BuildRequires: tomcat-servlet-3.0-api
|
BuildRequires: tomcat-servlet-3.0-api
|
||||||
BuildRequires: tomcat-el-2.2-api
|
BuildRequires: tomcat-el-2.2-api
|
||||||
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
||||||
@ -251,8 +251,8 @@ Requires: xml-commons-apis >= 1.4.01-12
|
|||||||
Requires: batik >= 1.8
|
Requires: batik >= 1.8
|
||||||
Requires: atinject >= 1-6
|
Requires: atinject >= 1-6
|
||||||
Requires: geronimo-annotation >= 1.0-7
|
Requires: geronimo-annotation >= 1.0-7
|
||||||
Requires: %{?scl_prefix}eclipse-ecf-core >= 3.6.0
|
Requires: %{?scl_prefix}eclipse-ecf-core >= 3.6.0-2
|
||||||
Requires: eclipse-emf-core >= 2.9.0
|
Requires: eclipse-emf-core >= 2.9.0-0.2
|
||||||
Requires: tomcat-servlet-3.0-api
|
Requires: tomcat-servlet-3.0-api
|
||||||
Requires: tomcat-el-2.2-api
|
Requires: tomcat-el-2.2-api
|
||||||
Requires: glassfish-jsp-api >= 2.2.1-4
|
Requires: glassfish-jsp-api >= 2.2.1-4
|
||||||
@ -749,10 +749,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
|||||||
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%pre jdt
|
|
||||||
# workaround for rpm bug, can be removed in F-20 Fixes the problem with efj being directory instead of launcher
|
|
||||||
%{?!scl:rm -rf %{_bindir}/efj/}
|
|
||||||
|
|
||||||
|
|
||||||
%files swt
|
%files swt
|
||||||
%dir %{_libdir}/%{pkg_name}
|
%dir %{_libdir}/%{pkg_name}
|
||||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
0aff7988c384ece2ac27e6abfe517e77 eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz
|
23f433f7a884c8029fe903cd1e70a8d7 eclipse-build-60a5a559fd746d946d869720c889bc698d9e6ab3.tar.xz
|
||||||
3c59e76d97e8efbbcd650e83780e16e0 R4_platform-aggregator-84cba7bf43da88dc3f33bc113104eb680f12aa2d.tar.bz2
|
3c59e76d97e8efbbcd650e83780e16e0 R4_platform-aggregator-84cba7bf43da88dc3f33bc113104eb680f12aa2d.tar.bz2
|
||||||
|
Loading…
Reference in New Issue
Block a user