From 9c21d648aeb7939149afc38baa56daaa4c12ca3d2682880d6e3a223b431854e0 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 14 Jan 2022 15:18:08 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/auto?expand=0&rev=10

---
 auto-common-0.10.tar.gz     |  3 ---
 auto-common-1.0.tar.gz      |  3 +++
 auto-service-1.0-rc4.tar.gz |  3 ---
 auto-service-1.0.tar.gz     |  3 +++
 auto.spec                   | 35 ++++++++++++++++++++++++++++-------
 5 files changed, 34 insertions(+), 13 deletions(-)
 delete mode 100644 auto-common-0.10.tar.gz
 create mode 100644 auto-common-1.0.tar.gz
 delete mode 100644 auto-service-1.0-rc4.tar.gz
 create mode 100644 auto-service-1.0.tar.gz

diff --git a/auto-common-0.10.tar.gz b/auto-common-0.10.tar.gz
deleted file mode 100644
index 23e4f3b..0000000
--- a/auto-common-0.10.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e94ceada878571a030e327df894b82b9b6af728b0b41d2f029ac2cfe5421200
-size 279601
diff --git a/auto-common-1.0.tar.gz b/auto-common-1.0.tar.gz
new file mode 100644
index 0000000..a2b8d49
--- /dev/null
+++ b/auto-common-1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ac17e9200b0dc80b89d33b34794eaf23a1cf60930be2f69a8fc8944fb424c72
+size 356936
diff --git a/auto-service-1.0-rc4.tar.gz b/auto-service-1.0-rc4.tar.gz
deleted file mode 100644
index 2801ee6..0000000
--- a/auto-service-1.0-rc4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d1a2194ea376aa78c56993ca1569dfe3645eb157e0f42fa2f161196a8be0e05
-size 271974
diff --git a/auto-service-1.0.tar.gz b/auto-service-1.0.tar.gz
new file mode 100644
index 0000000..45b43dd
--- /dev/null
+++ b/auto-service-1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a53ad130fd202b22537ba835cb655ab55eaee08280b0ecb64810889b96d6481
+size 356962
diff --git a/auto.spec b/auto.spec
index 295d708..e197894 100644
--- a/auto.spec
+++ b/auto.spec
@@ -17,8 +17,8 @@
 
 
 %global auto_ver 1.6.1
-%global common_ver 0.10
-%global service_ver 1.0-rc4
+%global common_ver 1.0
+%global service_ver 1.0
 %global parent_ver 6
 Name:           auto
 Version:        %{auto_ver}
@@ -36,6 +36,7 @@ BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.squareup:javapoet)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-invoker-plugin)
+BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 BuildArch:      noarch
 
 %description
@@ -51,13 +52,25 @@ Obsoletes:      %{name}-factory < %{version}-%{release}
 Common utilities for creating annotation processors.
 
 %package service
-Summary:        Provider-configuration files for ServiceLoader
+Summary:        AutoService Processor
 Group:          Development/Libraries/Java
 
 %description service
-A configuration/meta-data generator for
-java.util.ServiceLoader-style service
-providers.
+Provider-configuration files for ServiceLoader.
+
+%package service-aggregator
+Summary:        AutoService Aggregator
+Group:          Development/Libraries/Java
+
+%description service-aggregator
+Aggregator POM for @AutoService.
+
+%package service-annotations
+Summary:        AutoService Annotations
+Group:          Development/Libraries/Java
+
+%description service-annotations
+Provider-configuration files for ServiceLoader.
 
 %package value
 Summary:        Auto Value
@@ -108,7 +121,9 @@ find -name '*.jar' -print -delete
 
 # 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_change_dep com.google.auto:auto-common com.google.auto:auto-common:1.0 value/processor
+%pom_change_dep com.google.auto.service:auto-service com.google.auto.service:auto-service:1.0 value/processor
+#%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
@@ -139,6 +154,12 @@ find -name '*.jar' -print -delete
 %doc service/README.md
 %license LICENSE.txt
 
+%files service-aggregator -f .mfiles-%{name}-service-aggregator
+%license LICENSE.txt
+
+%files service-annotations -f .mfiles-%{name}-service-annotations
+%license LICENSE.txt
+
 %files value -f .mfiles-%{name}-value
 %doc value/README.md
 %license LICENSE.txt