diff --git a/.gitignore b/.gitignore index 19ec41f..72b6c9e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /javapackages-0.12.5.tar.xz /javapackages-0.12.6.tar.xz /javapackages-2f13366e47a0a687160fe3c555e5588af49a7566.tar.bz2 +/javapackages-0.13.0.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 5a1a201..dd3bc95 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,11 +1,11 @@ Name: javapackages-tools Version: 0.13.0 -Release: 0.1.git2f13366%{?dist} +Release: 1%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://fedorahosted.org/javapackages/ -Source0: http://git.fedorahosted.org/cgit/javapackages.git/snapshot/javapackages-2f13366e47a0a687160fe3c555e5588af49a7566.tar.bz2 +Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz 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-2f13366e47a0a687160fe3c555e5588af49a7566 +%setup -q -n javapackages-%{version} %build @@ -81,7 +81,8 @@ 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 +install -p -m 644 configs/configuration*.xml $RPM_BUILD_ROOT%{_datadir}/xmvn +ln -sf %{_datadir}/xmvn/configuration-19.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. @@ -107,10 +108,13 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild} %{_sysconfdir}/rpm/macros.xmvn %{_sysconfdir}/maven/*.xml %{_bindir}/mvn-* -%{_datadir}/xmvn/configuration.xml +%{_datadir}/xmvn/configuration*.xml %changelog +* Wed Mar 6 2013 Mikolaj Izdebski - 0.13.0-1 +- Update to upstream version 0.13.0 + * Wed Mar 6 2013 Mikolaj Izdebski - 0.13.0-0.1.git2f13366 - Upate to upstream pre-release snapshot 2f13366 diff --git a/sources b/sources index 34750cc..0e9b0e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a92249d43739db120cf2a202fb6f8242 javapackages-2f13366e47a0a687160fe3c555e5588af49a7566.tar.bz2 +2a97fc9da9ff287940ae4e25808fdf30 javapackages-0.13.0.tar.xz