diff --git a/.gitignore b/.gitignore
index 6f237da..9e1cc61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/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
diff --git a/auto.spec b/auto.spec
index ada1640..8d76d3a 100644
--- a/auto.spec
+++ b/auto.spec
@@ -1,15 +1,14 @@
Name: auto
-Version: 1.3
-Release: 4%{?dist}
+Version: 1.4.1
+Release: 1%{?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
BuildRequires: maven-local
+BuildRequires: mvn(com.google.guava:guava:19.0)
BuildRequires: mvn(com.squareup:javapoet)
-BuildRequires: mvn(javax.inject:javax.inject)
-BuildRequires: mvn(org.ow2.asm:asm)
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
BuildArch: noarch
@@ -20,16 +19,12 @@ that automate those types of tasks.
%package common
Summary: Auto Common Utilities
+# Obsoletes added in F30
+Obsoletes: %{name}-factory < %{version}-%{release}
%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
@@ -55,17 +50,12 @@ This package contains javadoc for %{name}.
find -name '*.class' -print -delete
find -name '*.jar' -print -delete
-%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
-%pom_xpath_set "pom:project/pom:version" %{version}
+%pom_xpath_set "pom:project/pom:version" 3
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
@@ -79,10 +69,11 @@ done
%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-service']/pom:version" %{version} factory value
%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-value']/pom:version" %{version} factory
-%build
+%mvn_package :build-only __noinstall
+%build
# Unavailable test deps
-%mvn_build -sf
+%mvn_build -sf -- -f build-pom.xml
%install
%mvn_install
@@ -96,10 +87,6 @@ done
%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
@@ -112,6 +99,10 @@ done
%license LICENSE.txt
%changelog
+* 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
diff --git a/sources b/sources
index 6e304c5..689f2ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (auto-value-1.3.tar.gz) = 9f76e53804832e1e21bb424cbc05ce43789db705c98cc9ddb50c46922f44507457ce1d12d4e18819dfe35d4d66718de5f0fd9d346eeccb5fe73a9e1941c7cfb3
+SHA512 (auto-value-1.4.1.tar.gz) = 933add2e824c5ae241d1d4d4b5c6d9b953e9a51a97d02812b159402c14222e5f097eb83fdedfb1ece2e36750a0fa86f0e696af76321baee711ca19f46caee1da