rpms/javapackages-tools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 3.3.1

Browse Source
This commit is contained in:
Mikolaj Izdebski 2013-10-02 17:40:08 +02:00
parent 2648c4bf8f
commit b876f7b17b
4 changed files with 7 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -54,3 +54,4 @@
/javapackages-3.2.3.tar.xz /javapackages-3.2.3.tar.xz
/javapackages-3.2.4.tar.xz /javapackages-3.2.4.tar.xz
/javapackages-3.3.0.tar.xz /javapackages-3.3.0.tar.xz
/javapackages-3.3.1.tar.xz

50
google-guice-sisu-guice-noaop.xml
View File

@ -1,50 +0,0 @@
<?xml version="1.0" encoding="US-ASCII"?>
<!-- This depmap file was generated by XMvn -->
<dependencyMap>
<requiresJava>1.5</requiresJava>
<skipProvides/>
<dependency>
<maven>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>3.1.3</version>
<classifier>no_aop</classifier>
</maven>
<jpp>
<groupId>JPP/guice</groupId>
<artifactId>google-guice</artifactId>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
<classifier>no_aop</classifier>
<version>3.1.3</version>
</maven>
<jpp>
<groupId>JPP/guice</groupId>
<artifactId>google-guice</artifactId>
</jpp>
</dependency>
<autoRequires>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</autoRequires>
<autoRequires>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</autoRequires>
<autoRequires>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</autoRequires>
<autoRequires>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</autoRequires>
<autoRequires>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</autoRequires>
</dependencyMap>

12
javapackages-tools.spec
View File

@ -1,5 +1,5 @@
Name: javapackages-tools Name: javapackages-tools
Version: 3.3.0 Version: 3.3.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support Summary: Macros and scripts for Java packaging support
@ -8,9 +8,6 @@ License: BSD
URL: https://fedorahosted.org/javapackages/ URL: https://fedorahosted.org/javapackages/
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
# temporary for rebuild with classifier support
Source1: google-guice-sisu-guice-noaop.xml
BuildArch: noarch BuildArch: noarch
BuildRequires: jpackage-utils BuildRequires: jpackage-utils
@ -107,8 +104,6 @@ pushd python
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
popd popd
cp %{SOURCE1} %{buildroot}%{_mavendepmapfragdir}/
%check %check
pushd python pushd python
%{__python} setup.py test %{__python} setup.py test
@ -123,7 +118,6 @@ popd
%doc LICENSE %doc LICENSE
%files -n maven-local -f files-maven %files -n maven-local -f files-maven
%{_mavendepmapfragdir}/google-guice-sisu-guice-noaop.xml
%files -n python-javapackages %files -n python-javapackages
%doc LICENSE %doc LICENSE
@ -134,6 +128,10 @@ popd
%changelog %changelog
* Wed Oct 2 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-1
- Update to upstream version 3.3.1
- Remove workaround for sisu-guice no_aop
* Tue Oct 01 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.3.0-1 * Tue Oct 01 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.3.0-1
- Update to upstream version 3.3.0 - Update to upstream version 3.3.0

2
sources
View File

@ -1 +1 @@
3c04d11c00a4510eb5db91782c353b18 javapackages-3.3.0.tar.xz 727bae8aa87a9dcdc23910d247a72b69 javapackages-3.3.1.tar.xz