diff --git a/SPECS/guava.spec b/SPECS/guava.spec index 17bac1b..70ce93d 100644 --- a/SPECS/guava.spec +++ b/SPECS/guava.spec @@ -3,7 +3,7 @@ Name: %{?scl_prefix}guava Version: 15.0 -Release: 1.2%{?dist} +Release: 1.3%{?dist} Summary: Google Core Libraries for Java Group: Development/Libraries @@ -12,12 +12,12 @@ URL: http://code.google.com/p/guava-libraries # git clone https://code.google.com/p/guava-libraries/ # (cd ./guava-libraries && git archive --format=tar --prefix=guava-%{version}/ v%{version}) | xz >guava-%{version}.tar.xz Source0: %{pkg_name}-%{version}.tar.xz -BuildRequires: %{?maven_scl_prefix}maven-local -BuildRequires: %{?maven_scl_prefix}maven-dependency-plugin +BuildRequires: %{?scl_prefix_java_common}maven-local +BuildRequires: %{?scl_prefix_maven}maven-dependency-plugin BuildRequires: java-devel >= 0:1.7.0 -BuildRequires: %{?maven_scl_prefix}sonatype-oss-parent -BuildRequires: %{?maven_scl_prefix}jsr-305 +BuildRequires: %{?scl_prefix_maven}sonatype-oss-parent +BuildRequires: %{?scl_prefix_maven}jsr-305 %{?scl:BuildRequires: %{?scl_prefix}build} BuildArch: noarch @@ -41,6 +41,7 @@ API documentation for %{pkg_name}. %setup -q -n %{pkg_name}-%{version} find . -name '*.jar' -delete +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %pom_disable_module guava-gwt %pom_disable_module guava-testlib %pom_disable_module guava-tests @@ -48,18 +49,19 @@ find . -name '*.jar' -delete %pom_remove_plugin :maven-gpg-plugin %pom_xpath_inject /pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:instructions "<_nouses>true" guava/pom.xml +%{?scl:EOF} %build -scl enable %{scl} - <<"EOF" +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %mvn_file :%{pkg_name} %{pkg_name} %mvn_alias :%{pkg_name} "com.google.collections:google-collections" %mvn_build -EOF +%{?scl:EOF} %install -scl enable %{scl} - <<"EOF" +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %mvn_install -EOF +%{?scl:EOF} %files -f .mfiles %doc AUTHORS CONTRIBUTORS COPYING README* @@ -68,6 +70,10 @@ EOF %doc COPYING %changelog +* Mon Feb 23 2015 Roland Grunberg - 15.0-1.3 +- Rebuilt to generate metadata. +- Related: rhbz#1175108. + * Mon Jun 02 2014 Roland Grunberg - 15.0-1.2 - Do not generate uses directive for exports.