diff --git a/SPECS/eclipse-swtbot.spec b/SPECS/eclipse-swtbot.spec index ddc20f4..0922a4c 100644 --- a/SPECS/eclipse-swtbot.spec +++ b/SPECS/eclipse-swtbot.spec @@ -1,15 +1,10 @@ %{?scl:%scl_package eclipse-swtbot} %{!?scl:%global pkg_name %{name}} -%{!?maven_scl:%global maven_scl_prefix %{nil}} - -%{?maven_scl:%global maven_scl_root /opt/rh/%{maven_scl}/root} -%{!?maven_scl:%global maven_scl_root %{nil}} - -%global install_loc %{_datadir}/eclipse/dropins/swtbot +%{?java_common_find_provides_and_requires} Name: %{?scl_prefix}eclipse-swtbot Version: 2.2.1 -Release: 6%{?dist} +Release: 6.2%{?dist} Summary: UI and functional testing tool for SWT and Eclipse based applications License: EPL @@ -17,22 +12,14 @@ URL: http://www.eclipse.org/swtbot/ Source0: http://git.eclipse.org/c/swtbot/org.eclipse.swtbot.git/snapshot/org.eclipse.swtbot-%{version}.tar.bz2 Patch0: drop-source-bundles.patch # Temporary patch required because hamcrest 1.3 is supplying hamcrest 1.1 -Patch1: eclipse-swtbot-hamcrest.patch -BuildRequires: tycho -BuildRequires: tycho-extras +Patch1: eclipse-swtbot-hamcrest.patch +BuildRequires: %{?scl_prefix}tycho +BuildRequires: %{?scl_prefix}tycho-extras BuildRequires: %{?scl_prefix}eclipse-gef BuildRequires: %{?scl_prefix}eclipse-pde -BuildRequires: %{?scl_prefix}junit >= 4.0.0 BuildRequires: %{?scl_prefix}cbi-plugins BuildRequires: %{?scl_prefix}eclipse-license -BuildRequires: %{?scl_prefix}feclipse-maven-plugin -BuildRequires: %{?scl_prefix}hamcrest -BuildRequires: %{maven_scl_prefix}log4j - -Requires: %{maven_scl_prefix}log4j -Requires: %{?scl_prefix}eclipse-gef -Requires: %{?scl_prefix}hamcrest - +BuildRequires: %{?scl_prefix_java_common}log4j BuildArch: noarch %description @@ -44,6 +31,7 @@ it suitable for UI/functional testing by everyone, not just developers. %prep %setup -q -n org.eclipse.swtbot-%{version} +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} for j in $(find -name \*.jar); do if [ ! -L $j ] ; then rm -fr $j @@ -55,49 +43,63 @@ done %pom_remove_plugin org.jacoco:jacoco-maven-plugin %pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin +%mvn_package ":*.test" __noinstall +%mvn_package ":*.test.*" __noinstall +%mvn_package ":*.examples" __noinstall +%mvn_package "::jar:sources:" +%{?scl:EOF} %build -scl enable %{scl} - <<"EOF" -xmvn -o clean install -Dmaven.test.skip=true -DskipTychoVersionCheck=true -EOF +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} +%mvn_build -j -f +%{?scl:EOF} %install -install -d -m 755 %{buildroot}%{install_loc} +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} +%mvn_install +%{?scl:EOF} -scl enable %{scl} - <<"EOF" -xmvn -o org.fedoraproject:feclipse-maven-plugin:install -DsourceRepo=org.eclipse.swtbot.updatesite/target/repository -DtargetLocation=%{buildroot}%{install_loc} -EOF +%files -f .mfiles -pushd %{buildroot}%{install_loc}/plugins - rm -fr org.apache.log4j* - ln -s %{maven_scl_root}%{_root_datadir}/java/log4j.jar . - rm -fr org.hamcrest* - ln -s %{_javadir}/hamcrest/core.jar hamcrest-core.jar - ln -s %{_javadir}/hamcrest/integration.jar hamcrest-integration.jar - ln -s %{_javadir}/hamcrest/library.jar hamcrest-library.jar -popd +%changelog +* Fri Jan 16 2015 Mat Booth - 2.2.1-6.2 +- Rebuilt to regenerate provides/requires -%files -%{install_loc} +* Wed Jan 14 2015 Mat Booth - 2.2.1-6.1 +- Resolves: rhbz#1175105 - Import into DTS 3.1 -%changelog -* Thu Aug 28 2014 Sami Wagiaalla 2.2.1-6 -- Add R/BR on hamcrest. +* Wed Dec 3 2014 Alexander Kurtakov 2.2.1-3 +- Build with xmvn. + +* Sat Jun 07 2014 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Jun 4 2014 Alexander Kurtakov 2.2.1-1 +- Update to upstream 2.2.1 release. + +* Mon Aug 12 2013 Alexander Kurtakov 2.1.1-1 +- Update to latest upstream version. + +* Sat Aug 03 2013 Fedora Release Engineering - 2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Apr 19 2013 Alexander Kurtakov 2.1.0-1 +- Update to the official release. -* Fri Jul 18 2014 Sami Wagiaalla 2.2.1-5 -- Add R on eclipse-gef +* Tue Feb 26 2013 Alexander Kurtakov 2.1.0-0.2.20130226git +- New snapshot removing org.junit4 references. -* Thu Jun 19 2014 Sami Wagiaalla 2.2.1-4 -- Add missing requirement on maven30-log4j. +* Tue Feb 26 2013 Alexander Kurtakov 2.1.0-0.1.20130225git +- Update to 2.1.0 prerelease - compatible with kepler platform. -* Mon Jun 9 2014 Sami Wagiaalla 2.2.1-3 -- Remove link to hamcrest-text.jar. +* Wed Feb 20 2013 Alexander Kurtakov 2.0.5-4.20120802git +- Skip tycho version check. -* Mon Jun 9 2014 Sami Wagiaalla 2.2.1-2 -- Use log4j from maven30 scl. +* Wed Feb 13 2013 Fedora Release Engineering - 2.0.5-3.20120802git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Wed Jun 4 2014 Sami Wagiaalla 2.2.1-1 -- Import from rawhide and build for DTS. +* Mon Aug 6 2012 Alexander Kurtakov 2.0.5-2.20120802git +- Fix review comments. -* Thu May 22 2014 Jeff Johnston 2.1.1-1 -- Import from rawhide and SCL-ize +* Thu Aug 2 2012 Alexander Kurtakov 2.0.5-1.gita95f41b7ae6d7790dab36bca982d4b833fd2662d +- Initial package