Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Roland Grunberg
a52d0c1063 Do not attempt to remove non-existent files. 2012-07-27 16:43:24 -04:00
Roland Grunberg
bc9a85139c Update to 0.15.0. 2012-07-27 16:43:14 -04:00
3 changed files with 17 additions and 7 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
/tycho-extras-0.14.x.tar.bz2
/tycho-extras-0.15.x.tar.bz2

View file

@ -1 +1 @@
b82910a9f9cb20e9a26faa8c7ae90eb0 tycho-extras-0.14.x.tar.bz2
ba3b5e40696ea9cc591d2a47bc7523c0 tycho-extras-0.15.x.tar.bz2

View file

@ -1,12 +1,12 @@
Name: tycho-extras
Version: 0.14.0
Version: 0.15.0
Release: 1%{?dist}
Summary: Additional plugins for Tycho
Group: Development/Libraries
License: EPL
URL: http://eclipse.org/tycho/
Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/tycho-extras-0.14.x.tar.bz2
Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/tycho-extras-0.15.x.tar.bz2
# maven-properties-plugin is only needed for tests
Patch0: %{name}-no-maven-properties-plugin.patch
@ -35,13 +35,13 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}-0.14.x
%setup -q -n %{name}-0.15.x
%patch0 -p1
%build
# To run tests, we need :
# maven-properties-plugin (unclear licensing)
mvn-rpmbuild -Dmaven.local.debug=true -X -Dmaven.test.skip=true install javadoc:aggregate
mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
%install
install -d -m 755 %{buildroot}%{_javadir}/%{name}
@ -52,7 +52,7 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-main.pom
for mod in tycho-custom-bundle-plugin tycho-eclipserun-plugin \
tycho-source-feature-plugin tycho-version-bump-plugin \
tycho-p2-extras-plugin; do
tycho-p2-extras-plugin pack200/tycho-pack200{{a,b}-plugin,-impl}; do
echo $mod
aid=`basename $mod`
install -pm 644 $mod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$aid.pom
@ -60,9 +60,15 @@ for mod in tycho-custom-bundle-plugin tycho-eclipserun-plugin \
%add_maven_depmap JPP.%{name}-$aid.pom %{name}/$aid.jar -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
done
for pommod in pack200; do
echo $pommod
aid=`basename $pommod`
install -pm 644 $pommod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$aid.pom
%add_maven_depmap JPP.%{name}-$aid.pom -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
done
# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
rm target/site/api*/{javadoc.sh,options,packages}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
@ -75,5 +81,8 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
* Fri Jul 27 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-1
- Update to 0.15.0.
* Tue Apr 16 2012 Roland Grunberg <rgrunber@redhat.com> - 0.14.0-1
- Initial packaging of tycho extras.