rpms/tycho
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Port to Plexus Archiver 3.0.1

Browse Source
This commit is contained in:
Mikolaj Izdebski 2015-06-09 15:00:18 +02:00
parent 236cba38ad
commit 50add6e0b4
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tycho-port-to-plexus-archiver-3.0.1.patch Normal file
View File

@ -0,0 +1,12 @@
--- tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java~ 2015-06-09 14:56:22.068303547 +0200
+++ tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java 2015-06-09 14:58:37.379329080 +0200
@@ -117,8 +117,7 @@
// mavenArchiver ignores license feature files that are also present in 'this' feature
// i.e. if there is a conflict, files from 'this' feature win
- DefaultArchivedFileSet result = new DefaultArchivedFileSet();
- result.setArchive(licenseFeature);
+ DefaultArchivedFileSet result = new DefaultArchivedFileSet(licenseFeature);
result.setIncludes(includes.toArray(new String[includes.size()]));
result.setExcludes(excludes.toArray(new String[excludes.size()]));

7
tycho.spec
View File

@ -27,7 +27,7 @@
Name: %{?scl_prefix}tycho
Version: 0.23.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
# license file is missing but all files having some licensing information are ASL 2.0
@ -61,6 +61,7 @@ Patch4: %{pkg_name}-maven-delegation.patch
# Additional changes needed just for bootstrap build
Patch5: %{pkg_name}-fix-bootstrap-build.patch
Patch6: %{pkg_name}-port-to-jetty-9.3.0.patch
Patch7: %{pkg_name}-port-to-plexus-archiver-3.0.1.patch
BuildArch: noarch
@ -173,6 +174,7 @@ tar -xf %{SOURCE6}
%patch3 -p1
%patch4 -p1
%patch6 -p0
%patch7 -p0
find tycho-core -iname '*html' -delete
@ -419,6 +421,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
%{_javadocdir}/tycho
%changelog
* Tue Jun 9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.23.0-2
- Port to Plexus Archiver 3.0.1
* Fri Jun 05 2015 Mat Booth <mat.booth@redhat.com> - 0.23.0-1
- Update to 0.23.0 release
- Allow tycho-bootstrap.sh to work with "set -e" to fail faster