diff --git a/.gitignore b/.gitignore index b6b2ea3..5579cfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,2 @@ /auto-value-1.0.tar.gz /auto-value-1.1.tar.gz -/auto-value-1.3.tar.gz -/auto-value-1.4.1.tar.gz -/auto-value-1.5.4.tar.gz -/auto-value-1.6.1.tar.gz diff --git a/auto.spec b/auto.spec index 1426217..118736c 100644 --- a/auto.spec +++ b/auto.spec @@ -1,108 +1,110 @@ -Name: auto -Summary: Collection of source code generators for Java -Version: 1.6.1 -Release: 16%{?dist} -# Automatically converted from old format: ASL 2.0 - review is highly recommended. -License: Apache-2.0 +Name: auto +Version: 1.1 +Release: 4%{?dist} +Summary: A collection of source code generators for Java +License: ASL 2.0 +URL: https://github.com/google/auto +Source0: https://github.com/google/auto/archive/auto-value-%{version}.tar.gz -URL: https://github.com/google/auto -# Source tarball is generated by script to ensure the correct tagged -# code is fetched for the various submodules -Source0: auto-value-%{version}.tar.gz -Source1: gen_auto_tarball.sh +BuildRequires: maven-local +BuildRequires: mvn(com.google.guava:guava) +BuildRequires: mvn(com.squareup:javawriter) +BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) +BuildRequires: mvn(org.apache.velocity:velocity) +BuildRequires: mvn(org.ow2.asm:asm) +BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) -BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(com.squareup:javapoet) -BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) +%if 0 +# Test deps +BuildRequires: mvn(com.google.code.findbugs:jsr305:1.3.9) +BuildRequires: mvn(junit:junit) +# Unavailable test deps +BuildRequires: mvn(com.google.dagger:dagger:2.0) +BuildRequires: mvn(com.google.dagger:dagger-compiler:2.0) +BuildRequires: mvn(com.google.guava:guava-testlib:18.0) +BuildRequires: mvn(com.google.inject:guice:4.0-beta) +BuildRequires: mvn(com.google.testing.compile:compile-testing:0.6) +BuildRequires: mvn(com.google.truth:truth:0.25) +%endif -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch +BuildArch: noarch %description The Auto sub-projects are a collection of code generators that automate those types of tasks. - %package common -Summary: Auto Common Utilities -# Obsoletes added in F30 -Obsoletes: %{name}-factory < %{version}-%{release} +Summary: Auto Common Utilities %description common Common utilities for creating annotation processors. +%package factory +Summary: JSR-330-compatible factories + +%description factory +A source code generator for JSR-330-compatible factories. %package service -Summary: Provider-configuration files for ServiceLoader +Summary: Provider-configuration files for ServiceLoader %description service A configuration/meta-data generator for java.util.ServiceLoader-style service providers. - %package value -Summary: Auto Value +Summary: Auto Value %description value Immutable value-type code generation for Java 1.6+. - -%package value-annotations -Summary: Auto Value Annotations - -%description value-annotations -Immutable value-type code generation for Java 1.6+. - - -%package value-parent -Summary: Auto Value Parent - -%description value-parent -Immutable value-type code generation for Java 1.6+. - - %package javadoc -Summary: Javadoc for %{name} +Summary: Javadoc for %{name} %description javadoc This package contains javadoc for %{name}. - %prep -%setup -q -n auto-value-%{version} +%setup -q -n auto-auto-value-%{version} find -name '*.class' -print -delete find -name '*.jar' -print -delete -# remove unnecessary dependency on parent POM -%pom_remove_parent +%pom_xpath_inject "pom:project" " + + common + factory + service + value +" -# Disable factory module due to missing dep: -# com.google.googlejavaformat:google-java-format -%pom_disable_module factory build-pom.xml -# Missing dep on com.google.gwt:gwt -%pom_disable_module src/it/functional value/pom.xml -%pom_disable_module src/it/gwtserializer value/pom.xml +%pom_xpath_set "pom:project/pom:version" %{version} +for p in common factory service value ;do +%pom_xpath_set "pom:parent/pom:version" %{version} ${p} +%pom_xpath_set "pom:project/pom:version" %{version} ${p} +%pom_xpath_remove "pom:dependency[pom:scope = 'test']" ${p} +done -# Fix deps in service module -%pom_xpath_set "pom:parent/pom:version" 6 service -%pom_change_dep com.google.auto:auto-common com.google.auto:auto-common:0.10 service %pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin -%pom_remove_plugin :maven-shade-plugin -%pom_remove_plugin :maven-shade-plugin value/processor - -%mvn_package :build-only __noinstall +%pom_remove_plugin :maven-shade-plugin value +%pom_remove_plugin :maven-invoker-plugin value +%pom_remove_plugin :maven-invoker-plugin factory +%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-service']/pom:version" %{version} factory +%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-common']/pom:version" %{version} factory +%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-common']/pom:version" %{version} service +%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-common']/pom:version" %{version} value +%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-service']/pom:version" %{version} value %build -# skip test suite because of unpackaged dependencies for tests -%mvn_build -sf -- -f build-pom.xml +# Unavailable test deps +%mvn_build -sf %install %mvn_install - %files -f .mfiles-%{name}-parent %dir %{_javadir}/%{name} %doc README.md @@ -112,6 +114,10 @@ find -name '*.jar' -print -delete %doc common/README.md %license LICENSE.txt +%files factory -f .mfiles-%{name}-factory +%doc factory/README.md +%license LICENSE.txt + %files service -f .mfiles-%{name}-service %doc service/README.md %license LICENSE.txt @@ -120,116 +126,10 @@ find -name '*.jar' -print -delete %doc value/README.md %license LICENSE.txt -%files value-annotations -f .mfiles-%{name}-value-annotations -%license LICENSE.txt - -%files value-parent -f .mfiles-%{name}-value-parent -%license LICENSE.txt - %files javadoc -f .mfiles-javadoc %license LICENSE.txt - %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1.6.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Tue Jul 29 2025 jiri vanek - 1.6.1-15 -- Rebuilt for java-25-openjdk as preffered jdk - -* Wed Jul 23 2025 Fedora Release Engineering - 1.6.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 1.6.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 24 2024 Miroslav Suchý - 1.6.1-12 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 1.6.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 1.6.1-10 -- Rebuilt for java-21-openjdk as system jdk - -* Mon Jan 22 2024 Fedora Release Engineering - 1.6.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.6.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.6.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 1.6.1-4 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 1.6.1-3 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 1.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Oct 16 2021 Orion Poplawski - 1.6.1-1 -- Update to 1.6.1 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.5.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.5.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.5.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1.5.4-5 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Mar 20 2020 Mat Booth - 1.5.4-4 -- Remove unneeded dep on plexus-java, used only for integration tests that we do - not execute - -* Thu Feb 20 2020 Mat Booth - 1.5.4-3 -- Allow compatibility with a broader range of guava versions - -* Tue Jan 28 2020 Fedora Release Engineering - 1.5.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Dec 13 2019 Fabio Valentini - 1.5.4-1 -- Update to version 1.5.4 -- Don't use compat version of guava any longer - -* Wed Jul 24 2019 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 15 2019 Mat Booth - 1.4.1-1 -- Update to release 1.4.1 of auto -- Disable unused factory module due to missing deps - -* Thu Jan 31 2019 Fedora Release Engineering - 1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 08 2018 Mat Booth - 1.3-2 -- Fix BRs - -* Fri Jun 08 2018 Mat Booth - 1.3-1 -- Update to 1.3 release of auto - -* Wed Feb 07 2018 Fedora Release Engineering - 1.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - * Fri Feb 10 2017 Fedora Release Engineering - 1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild @@ -247,4 +147,3 @@ find -name '*.jar' -print -delete * Tue Mar 31 2015 gil cattaneo 1.0-1 - initial rpm - diff --git a/gen_auto_tarball.sh b/gen_auto_tarball.sh deleted file mode 100755 index c2ec93e..0000000 --- a/gen_auto_tarball.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -e - -VAL_TAG=auto-value-1.6.1 -COM_TAG=auto-common-0.10 -SER_TAG=auto-service-1.0-rc4 -PARENT_TAG=auto-parent-6 - -mkdir $VAL_TAG/ -pushd $VAL_TAG/ -wget https://github.com/google/auto/archive/$VAL_TAG.tar.gz -tar xvf $VAL_TAG.tar.gz --strip-components=1 -rm -rf pom.xml factory/ common/ service/ -wget https://github.com/google/auto/archive/$COM_TAG.tar.gz -tar xvf $COM_TAG.tar.gz --strip-components=1 auto-$COM_TAG/common -wget https://github.com/google/auto/archive/$SER_TAG.tar.gz -tar xvf $SER_TAG.tar.gz --strip-components=1 auto-$SER_TAG/service -wget https://github.com/google/auto/archive/$PARENT_TAG.tar.gz -tar xvf $PARENT_TAG.tar.gz --strip-components=1 auto-$PARENT_TAG/pom.xml -rm *.tar.gz -popd - -tar caf $VAL_TAG.tar.gz $VAL_TAG/ -rm -rf $VAL_TAG/ - diff --git a/sources b/sources index 846c2d5..00e90ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (auto-value-1.6.1.tar.gz) = 67caf30d8996059b4b6327bed27e38fd7ac33f6de6c67ec11f4033a1e07177c91640d42eca529f8eed1ff8ecd1eeaeb3a9095464a25f0b47046e6c7d021cca88 +9f9b3becf5fce448fd3e77424beb104d auto-value-1.1.tar.gz