Upate to upstream pre-release snapshot 2f13366

This commit is contained in:
Mikolaj Izdebski 2013-03-06 13:12:23 +01:00
parent 389cff6cc3
commit 7f52b35a37
3 changed files with 15 additions and 5 deletions

1
.gitignore vendored
View File

@ -26,3 +26,4 @@
/javapackages-0.12.4.tar.xz
/javapackages-0.12.5.tar.xz
/javapackages-0.12.6.tar.xz
/javapackages-2f13366e47a0a687160fe3c555e5588af49a7566.tar.bz2

View File

@ -1,11 +1,11 @@
Name: javapackages-tools
Version: 0.12.6
Release: 1%{?dist}
Version: 0.13.0
Release: 0.1.git2f13366%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
URL: https://fedorahosted.org/javapackages/
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
Source0: http://git.fedorahosted.org/cgit/javapackages.git/snapshot/javapackages-2f13366e47a0a687160fe3c555e5588af49a7566.tar.bz2
BuildArch: noarch
BuildRequires: jpackage-utils
@ -51,7 +51,7 @@ This package provides macros and scripts to support packaging Maven artifacts.
%prep
%setup -q -n javapackages-%{version}
%setup -q -n javapackages-2f13366e47a0a687160fe3c555e5588af49a7566
%build
@ -62,6 +62,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rpm
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/maven
install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven-effective-poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/xmvn
install -p -m 755 depgenerators/maven.prov $RPM_BUILD_ROOT%{_rpmconfigdir}
install -p -m 755 depgenerators/maven.req $RPM_BUILD_ROOT%{_rpmconfigdir}
@ -77,8 +78,11 @@ install -p -m 644 macros.* $RPM_BUILD_ROOT%{_sysconfdir}/rpm
install -p -m 644 metadata/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/maven
install -p -m 644 scripts/maven_depmap.py $RPM_BUILD_ROOT%{_javadir}-utils
install -p -m 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils
install -p -m 644 scripts/xmvn_config_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils
install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 configs/system-configuration.xml $RPM_BUILD_ROOT%{_datadir}/xmvn/configuration.xml
# On Fedora 18 we don't want to install mvn-local and mvn-rpmbuild
# scripts as they are already provided by maven package.
%if 0%{fedora} == 18
@ -99,12 +103,17 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%{_sysconfdir}/rpm/macros.fjava
%files -n maven-local
%{_javadir}-utils/xmvn_config_editor.sh
%{_sysconfdir}/rpm/macros.xmvn
%{_sysconfdir}/maven/*.xml
%{_bindir}/mvn-*
%{_datadir}/xmvn/configuration.xml
%changelog
* Wed Mar 6 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.13.0-0.1.git2f13366
- Upate to upstream pre-release snapshot 2f13366
* Mon Mar 4 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.12.6-1
- Update to upstream version 0.12.6
- Resolves: rhbz#917618 (remove jetty orbit provides)

View File

@ -1 +1 @@
d427676361b553a08bcac3e78528667a javapackages-0.12.6.tar.xz
a92249d43739db120cf2a202fb6f8242 javapackages-2f13366e47a0a687160fe3c555e5588af49a7566.tar.bz2