Update to upstream version 1.2.0

This commit is contained in:
Mikolaj Izdebski 2013-10-18 10:16:31 +02:00
parent 924c65a78a
commit a03f63d0f7
3 changed files with 9 additions and 7 deletions

1
.gitignore vendored
View File

@ -26,3 +26,4 @@
/xmvn-1.0.1.tar.xz /xmvn-1.0.1.tar.xz
/xmvn-1.0.2.tar.xz /xmvn-1.0.2.tar.xz
/xmvn-1.1.0.tar.xz /xmvn-1.1.0.tar.xz
/xmvn-1.2.0.tar.xz

View File

@ -1 +1 @@
33881f6a1f40995db3a1a6b530555947 xmvn-1.1.0.tar.xz 7511a7b9a38171e6ebbb04e28be48820 xmvn-1.2.0.tar.xz

View File

@ -1,14 +1,12 @@
Name: xmvn Name: xmvn
Version: 1.1.0 Version: 1.2.0
Release: 2%{?dist} Release: 1%{?dist}
Summary: Local Extensions for Apache Maven Summary: Local Extensions for Apache Maven
License: ASL 2.0 License: ASL 2.0
URL: http://mizdebsk.fedorapeople.org/xmvn URL: http://mizdebsk.fedorapeople.org/xmvn
BuildArch: noarch BuildArch: noarch
Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz
Patch1: 0001-Take-stereotypes-into-account-during-dependency-extr.patch
BuildRequires: maven >= 3.1.0 BuildRequires: maven >= 3.1.0
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: beust-jcommander BuildRequires: beust-jcommander
@ -17,6 +15,7 @@ BuildRequires: maven-dependency-plugin
BuildRequires: maven-plugin-build-helper BuildRequires: maven-plugin-build-helper
BuildRequires: maven-assembly-plugin BuildRequires: maven-assembly-plugin
BuildRequires: maven-invoker-plugin BuildRequires: maven-invoker-plugin
BuildRequires: xmlunit
Requires: maven >= 3.1.0 Requires: maven >= 3.1.0
@ -34,7 +33,6 @@ This package provides %{summary}.
%prep %prep
%setup -q %setup -q
%patch1 -p1
# remove dependency plugin maven-binaries execution # remove dependency plugin maven-binaries execution
# we provide apache-maven by symlink # we provide apache-maven by symlink
@ -51,7 +49,7 @@ ln -s %{_datadir}/maven target/dependency/apache-maven-$mver
rm -rf src/it rm -rf src/it
%build %build
%mvn_build -X %mvn_build
tar --delay-directory-restore -xvf target/*tar.bz2 tar --delay-directory-restore -xvf target/*tar.bz2
chmod -R +rwX %{name}-%{version}* chmod -R +rwX %{name}-%{version}*
@ -144,6 +142,9 @@ end
%doc LICENSE NOTICE %doc LICENSE NOTICE
%changelog %changelog
* Fri Oct 18 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-1
- Update to upstream version 1.2.0
* Mon Oct 07 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.0-2 * Mon Oct 07 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.0-2
- Apply patch for rhbz#1015596 - Apply patch for rhbz#1015596