diff --git a/.gitignore b/.gitignore index b6b2ea3..0825c58 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ /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..d04db8b 100644 --- a/auto.spec +++ b/auto.spec @@ -1,9 +1,8 @@ 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 +Version: 1.5.4 +Release: 1%{?dist} +License: ASL 2.0 URL: https://github.com/google/auto # Source tarball is generated by script to ensure the correct tagged @@ -11,12 +10,12 @@ URL: https://github.com/google/auto Source0: auto-value-%{version}.tar.gz Source1: gen_auto_tarball.sh -BuildRequires: maven-local-openjdk25 +BuildRequires: maven-local +BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(com.squareup:javapoet) -BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) +BuildRequires: mvn(org.codehaus.plexus:plexus-java) BuildArch: noarch -ExclusiveArch: %{java_arches} noarch %description The Auto sub-projects are a collection of code generators @@ -48,20 +47,6 @@ Summary: Auto 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} @@ -80,16 +65,14 @@ find -name '*.jar' -print -delete # 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 # 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 +%pom_remove_plugin :maven-shade-plugin value +%pom_remove_plugin :maven-invoker-plugin value %mvn_package :build-only __noinstall @@ -120,87 +103,11 @@ 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 diff --git a/gen_auto_tarball.sh b/gen_auto_tarball.sh index c2ec93e..be2911f 100755 --- a/gen_auto_tarball.sh +++ b/gen_auto_tarball.sh @@ -1,6 +1,6 @@ -#!/bin/bash -e +#!/bin/bash -VAL_TAG=auto-value-1.6.1 +VAL_TAG=auto-value-1.5.4 COM_TAG=auto-common-0.10 SER_TAG=auto-service-1.0-rc4 PARENT_TAG=auto-parent-6 diff --git a/sources b/sources index 846c2d5..ccb80a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (auto-value-1.6.1.tar.gz) = 67caf30d8996059b4b6327bed27e38fd7ac33f6de6c67ec11f4033a1e07177c91640d42eca529f8eed1ff8ecd1eeaeb3a9095464a25f0b47046e6c7d021cca88 +SHA512 (auto-value-1.5.4.tar.gz) = eac782de9e32d516cec2e16d567b19ad663218334ffcd43113b7fd5d6f15fdd8289f8337b14ea4222057bbd6ced2c20fd22f182b7c17861058c2febe2cf601b8