rpms/plexus-utils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix license tag and ASL 2.0 license text

Browse Source
This commit is contained in:
Stanislav Ochotnicky 2012-11-23 16:51:48 +01:00
parent 49ecfc2061
commit 20356b9e3f
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
plexus-utils-3.0.tar.xz plexus-utils-3.0.tar.xz
/sonatype-plexus-utils-plexus-utils-3.0.9-0-g64c7726.tar.gz /sonatype-plexus-utils-plexus-utils-3.0.9-0-g64c7726.tar.gz
/sources /sources
/LICENSE-2.0.txt

29
plexus-utils.spec
View File

@ -33,13 +33,20 @@
Name: plexus-utils Name: plexus-utils
Version: 3.0.9 Version: 3.0.9
Release: 1%{?dist} Release: 2%{?dist}
Summary: Plexus Common Utilities Summary: Plexus Common Utilities
License: ASL 1.1 and ASL 2.0 and MIT # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/
# xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory
# ASL 2.0 and BSD:
# src/main/java/org/codehaus/plexus/util/cli/StreamConsumer
# src/main/java/org/codehaus/plexus/util/cli/StreamPumper
# src/main/java/org/codehaus/plexus/util/cli/Commandline
# rest is ASL 2.0
License: ASL 1.1 and ASL 2.0 and xpp and BSD
Group: Development/Libraries Group: Development/Libraries
URL: http://plexus.codehaus.org/ URL: http://plexus.codehaus.org/
# fetched from https://github.com/sonatype/plexus-utils/tarball/plexus-utils-3.0.9 Source0: https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz
Source0: sonatype-plexus-utils-plexus-utils-3.0.9-0-g64c7726.tar.gz Source1: http://apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: jpackage-utils >= 0:1.6
@ -74,7 +81,8 @@ Requires: jpackage-utils
Javadoc for %{name}. Javadoc for %{name}.
%prep %prep
%setup -q -n sonatype-plexus-utils-c307dd9 %setup -q -n %{name}-%{name}-%{version}
cp %{SOURCE1} .
%build %build
mvn-rpmbuild install javadoc:javadoc -Dmaven.test.failure.ignore=true mvn-rpmbuild install javadoc:javadoc -Dmaven.test.failure.ignore=true
@ -95,16 +103,17 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files %files -f .mfiles
%{_javadir}/* %doc NOTICE.txt LICENSE-2.0.txt
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%doc NOTICE.txt
%files javadoc %files javadoc
%doc NOTICE.txt LICENSE-2.0.txt
%doc %{_javadocdir}/%{name} %doc %{_javadocdir}/%{name}
%changelog %changelog
* Fri Nov 23 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.9-2
- Fix license tag and ASL 2.0 license text
* Wed Oct 10 2012 Alexander Kurtakov <akurtako@redhat.com> 3.0.9-1 * Wed Oct 10 2012 Alexander Kurtakov <akurtako@redhat.com> 3.0.9-1
- Update to upstream 3.0.9. - Update to upstream 3.0.9.

1
sources
View File

@ -1 +1,2 @@
43bf1f82033fafa2121d25d7d5d62497 sonatype-plexus-utils-plexus-utils-3.0.9-0-g64c7726.tar.gz 43bf1f82033fafa2121d25d7d5d62497 sonatype-plexus-utils-plexus-utils-3.0.9-0-g64c7726.tar.gz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt