From 581235ecaa80da3c50a90a5212fac8468edfe649 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 23 2015 07:41:20 +0000 Subject: import devtoolset-3-eclipse-gef-3.9.101-2.2.el7 --- diff --git a/.devtoolset-3-eclipse-gef.metadata b/.devtoolset-3-eclipse-gef.metadata index fac46f3..b8aa304 100644 --- a/.devtoolset-3-eclipse-gef.metadata +++ b/.devtoolset-3-eclipse-gef.metadata @@ -1 +1 @@ -139a50f078f63caf40590baaead6883cf287d716 SOURCES/org.eclipse.gef-b63ec56b20b75fc5af90fbb1e85911bed35997dc.tar.bz2 +78e2d21a069732d42e3c56e6948315fb74fb6916 SOURCES/org.eclipse.gef-f4eada958b82a6a8c4edff8e0f12cdad47b79c28.tar.bz2 diff --git a/.gitignore b/.gitignore index 18d3cfc..bc9a8ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/org.eclipse.gef-b63ec56b20b75fc5af90fbb1e85911bed35997dc.tar.bz2 +SOURCES/org.eclipse.gef-f4eada958b82a6a8c4edff8e0f12cdad47b79c28.tar.bz2 diff --git a/SOURCES/get-gef.sh b/SOURCES/get-gef.sh index cbda837..6ab78a5 100644 --- a/SOURCES/get-gef.sh +++ b/SOURCES/get-gef.sh @@ -1,6 +1,6 @@ #!/bin/sh -TAG=b63ec56b20b75fc5af90fbb1e85911bed35997dc +TAG=f4eada958b82a6a8c4edff8e0f12cdad47b79c28 rm -rf org.eclipse.gef-$TAG.tar.bz2 wget http://git.eclipse.org/c/gef/org.eclipse.gef.git/snapshot/org.eclipse.gef-$TAG.tar.bz2 diff --git a/SPECS/eclipse-gef.spec b/SPECS/eclipse-gef.spec index 71752ca..eb32ba0 100644 --- a/SPECS/eclipse-gef.spec +++ b/SPECS/eclipse-gef.spec @@ -1,16 +1,16 @@ %{?scl:%scl_package eclipse-gef} %{!?scl:%global pkg_name %{name}} +%{?java_common_find_provides_and_requires} + %global eclipse_dropin %{_datadir}/eclipse/dropins -# There is no tag in the upstream repository, but this revision -# is the one that the maintenance branch was created at so this -# is sort of a "post-release snapshot" -%global git_version b63ec56b20b75fc5af90fbb1e85911bed35997dc +# Release has not been tagged, but this commit comprised the release +%global git_version f4eada958b82a6a8c4edff8e0f12cdad47b79c28 Name: %{?scl_prefix}eclipse-gef -Version: 3.9.100 +Version: 3.9.101 -Release: 1.gitb63ec56%{?dist} +Release: 2.2%{?dist} Summary: Graphical Editing Framework (GEF) Eclipse plug-in Group: System Environment/Libraries License: EPL @@ -22,11 +22,10 @@ Source1: get-gef.sh BuildArch: noarch -BuildRequires: %{?maven_scl_prefix}maven-local -BuildRequires: tycho +BuildRequires: %{?scl_prefix}tycho BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.4.0 BuildRequires: %{?scl_prefix}eclipse-license -BuildRequires: %{?maven_scl_prefix}ant-contrib +BuildRequires: %{?scl_prefix_maven}ant-contrib Requires: %{?scl_prefix}eclipse-platform >= 1:4.4.0 %description @@ -60,106 +59,90 @@ to use the Eclipse Graphical Editing Framework (GEF) plug-in. find -name *.jar -exec rm -rf {} \; find -name *.class -exec rm -rf {} \; -%build -%{?scl:scl enable %{scl} - << "EOF"} -xmvn -o clean verify -f org.eclipse.gef.releng/pom.xml -Dmaven.test.skip=true -P !LUNA_4_4.target +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_package "org.eclipse.gef:" __noinstall +%mvn_package "org.eclipse.gef.features:org.eclipse.gef.all" __noinstall +%mvn_package "org.eclipse.gef.features:org.eclipse.gef.examples{,.source}" examples +%mvn_package ":org.eclipse.gef.examples.{logic,flow,text,shapes}:jar:sources:" examples +%mvn_package "::jar:sources:" sdk +%mvn_package ":*.{sdk,source,test,tests,capabilities}" sdk +%mvn_package "org.eclipse.draw2d.{features,plugins}:org.eclipse.draw2d" core +%mvn_package "org.eclipse.gef.{features,plugins}:org.eclipse.gef" core +%mvn_package "org.eclipse.zest.features:org.eclipse.zest" core +%mvn_package "org.eclipse.zest.plugins:org.eclipse.zest.{core,layouts}" core %{?scl:EOF} -pushd org.eclipse.gef.repository/target/repository/features/ -for f in `ls`; do \ - name=${f/.jar//}; \ - mkdir $name; \ - unzip -q -n -d $name $f ; \ - rm -rf $f -done -popd +%build +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_build -j -f -- -f org.eclipse.gef.releng/pom.xml -P !LUNA_4_4.target +%{?scl:EOF} %install -install -d -m 755 %{buildroot}%{eclipse_dropin} -install -d -m 755 %{buildroot}%{eclipse_dropin}/gef/eclipse/features -install -d -m 755 %{buildroot}%{eclipse_dropin}/gef/eclipse/plugins -install -d -m 755 %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features -install -d -m 755 %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins -install -d -m 755 %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/features -install -d -m 755 %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/plugins - -mv org.eclipse.gef.repository/target/repository/features/org.eclipse.gef_* %{buildroot}%{eclipse_dropin}/gef/eclipse/features/ -mv org.eclipse.gef.repository/target/repository/features/org.eclipse.draw2d_* %{buildroot}%{eclipse_dropin}/gef/eclipse/features/ -mv org.eclipse.gef.repository/target/repository/features/org.eclipse.zest_* %{buildroot}%{eclipse_dropin}/gef/eclipse/features/ - -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef_*.jar %{buildroot}%{eclipse_dropin}/gef/eclipse/plugins/ -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.draw2d_*.jar %{buildroot}%{eclipse_dropin}/gef/eclipse/plugins/ -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.zest.core_*.jar %{buildroot}%{eclipse_dropin}/gef/eclipse/plugins/ -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.zest.layouts_*.jar %{buildroot}%{eclipse_dropin}/gef/eclipse/plugins/ - -mv org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.sdk_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/ -mv org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.source_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/ -mv org.eclipse.gef.repository/target/repository/features/org.eclipse.zest.sdk_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/ -mv org.eclipse.gef.repository/target/repository/features/org.eclipse.zest.source_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/ -mv org.eclipse.gef.repository/target/repository/features/org.eclipse.draw2d.sdk_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/ -mv org.eclipse.gef.repository/target/repository/features/org.eclipse.draw2d.source_* %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features/ - -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.draw2d.doc.isv_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/ -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.draw2d.source_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/ -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.zest.doc.isv_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/ -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef.doc.isv_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/ -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef.examples.ui.pde_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/ -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef.source_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/ -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.zest.core.source_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/ -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.zest.layouts.source_*.jar %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins/ - -mv org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.examples_* %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/features/ -mv org.eclipse.gef.repository/target/repository/features/org.eclipse.gef.examples.source_* %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/features/ - -mv org.eclipse.gef.repository/target/repository/plugins/org.eclipse.gef.examples.{flow,flow.source,logic,logic.source,shapes,shapes.source,text,text.source}_*.jar %{buildroot}%{eclipse_dropin}/gef-examples/eclipse/plugins/ - -%files -%{eclipse_dropin}/gef +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_install +%{?scl:EOF} + +%files -f .mfiles -f .mfiles-core %doc org.eclipse.gef-feature/epl-v10.html -%files sdk -%{eclipse_dropin}/gef-sdk +%files sdk -f .mfiles-sdk %doc org.eclipse.gef.sdk-feature/epl-v10.html -%files examples -%{eclipse_dropin}/gef-examples +%files examples -f .mfiles-examples %doc org.eclipse.gef.examples-feature/epl-v10.html %changelog +* Sun Jan 25 2015 Mat Booth - 3.9.101-2.2 +- Resolves: rhbz#1185542 - Rebuild to fix broken symlinks + +* Wed Jan 14 2015 Mat Booth - 3.9.101-2.1 +- Resolves: rhbz#1175105 - Import into DTS 3.1 + +* Wed Jan 14 2015 Mat Booth - 3.9.101-2 +- Migrate to mvn_build/mvn_install + +* Tue Sep 30 2014 Mat Booth - 3.9.101-1 +- Update to 3.9.101 + * Mon Jun 30 2014 Mat Booth - 3.9.100-1.gitb63ec56 - Update to latest upstream release - Add a script to make smaller source tarballs - Add BR on eclipse-license -* Wed May 21 2014 Roland Grunberg - 3.9.1-0.4.gitb9f2e9 -- Make changes to build on DTS 3.0. +* Sat Jun 07 2014 Fedora Release Engineering - 3.9.1-0.4.gitb9f2e9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Mon Oct 28 2013 Krzysztof Daniel 3.9.1-0.3.gitb9f2e9 +* Fri Mar 28 2014 Michael Simacek - 3.9.1-0.3.gitb9f2e9 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Oct 28 2013 Krzysztof Daniel 3.9.1-0.2.gitb9f2e9 - Deploy missing bundles and features. -* Tue Oct 8 2013 Krzysztof Daniel 3.9.1-0.2.gitb9f2e9 -- Fix typo in the spec. +* Tue Oct 1 2013 Krzysztof Daniel 3.9.1-0.1.gitb9f2e9 +- Update to Kepler SR1. -* Tue Oct 8 2013 Krzysztof Daniel 3.9.1-0.1.gitb9f2e9 -- Update to Kepler SR1 release (RHBZ#1015996). +* Sat Aug 03 2013 Fedora Release Engineering - 3.9.0-2.git22becd5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Fri Jun 28 2013 Krzysztof Daniel 3.9.0-1.git22becd5 -- Update to Kepler release. +* Mon Jun 17 2013 Krzysztof Daniel 3.9.0-1.git22becd5 +- Kepler release. -* Wed Apr 17 2013 Krzysztof Daniel 3.9.0-0.3.gitbd7178d -- Sync with latest F20 version (3.9.0-0.2.gitbd7178d) +* Tue Apr 9 2013 Alexander Kurtakov 3.9.0-0.2.gitbd7178d +- New snapshot containing upstream fix for icu4j 50.x. -* Wed Feb 13 2013 Roland Grunberg 3.8.1-8 -- Rebuild as noarch. +* Wed Apr 3 2013 Alexander Kurtakov 3.9.0-0.1.gitdbf4cef +- Update to 3.9.0 snapshot (aka Kepler). +- SCL-ize. -* Thu Dec 13 2012 Krzysztof Daniel 3.8.1-7 -- Put plugins into a proper location. +* Thu Feb 21 2013 Alexander Kurtakov 3.8.1-7 +- Adapt to the icu4j version jump. +- Skip tests for now. -* Fri Dec 7 2012 Alexander Kurtakov 3.8.1-6 -- SCL-ize. +* Wed Feb 13 2013 Fedora Release Engineering - 3.8.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Thu Dec 6 2012 Roland Grunberg 3.8.1-5 -- Make changes to build in SCL environment. +* Tue Jan 22 2013 Krzysztof Daniel 3.8.1-5 +- Ignore Tycho version check. * Thu Oct 4 2012 Krzysztof Daniel 3.8.1-4 - Configure only one Tycho version.