From e2b4b3214280c6d6e12d8fbb6d73256cf3163115bed4826e1a6fd872029915c2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:19:20 +0000 Subject: [PATCH 1/2] Accepting request 1114361 from Java:packages:test simplify OBS-URL: https://build.opensuse.org/request/show/1114361 OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-guice?expand=0&rev=29 --- google-guice.spec | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index 22fb507..b48328c 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -35,7 +35,7 @@ BuildRequires: glassfish-servlet-api BuildRequires: google-errorprone-annotations BuildRequires: guava BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: jsr-305 BuildRequires: objectweb-asm Provides: %{short_name}-multibindings = %{version} @@ -168,20 +168,6 @@ This package provides %{summary}. %pom_disable_module spring extensions %pom_disable_module testlib extensions -%pom_change_dep -r -f ::::: ::::: - -%pom_remove_parent core -%pom_xpath_inject pom:project " - com.google.inject - %{version}" core - -for mdl in assistedinject dagger-adapter grapher jmx jndi persist servlet spring struts2 testlib throwingproviders; do - %pom_remove_parent extensions/${mdl} - %pom_xpath_inject pom:project " - com.google.inject.extensions - %{version}" extensions/${mdl} -done - %build mkdir -p lib build-jar-repository -s lib \ @@ -219,27 +205,27 @@ install -pm 0644 extensions/grapher/target/guice-grapher-%{version}.jar \ # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{short_name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-parent.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-parent.pom %add_maven_depmap %{short_name}/guice-parent.pom -f parent -install -pm 0644 bom/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-bom.pom +%{mvn_install_pom} bom/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-bom.pom %add_maven_depmap %{short_name}/guice-bom.pom -f bom -install -pm 0644 extensions/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/extensions-parent.pom +%{mvn_install_pom} extensions/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/extensions-parent.pom %add_maven_depmap %{short_name}/extensions-parent.pom -a org.sonatype.sisu.inject:extensions-parent -f extensions -install -pm 0644 core/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/%{name}.pom +%{mvn_install_pom} core/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/%{name}.pom %add_maven_depmap %{short_name}/%{name}.pom %{short_name}/%{name}.jar -a "org.sonatype.sisu:sisu-guice,com.google.inject:guice::no_aop:,org.sonatype.sisu:sisu-guice::no_aop:" -install -pm 0644 extensions/jmx/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jmx.pom +%{mvn_install_pom} extensions/jmx/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jmx.pom %add_maven_depmap %{short_name}/guice-jmx.pom %{short_name}/guice-jmx.jar -a org.sonatype.sisu.inject:guice-jmx -f jmx -install -pm 0644 extensions/assistedinject/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-assistedinject.pom +%{mvn_install_pom} extensions/assistedinject/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-assistedinject.pom %add_maven_depmap %{short_name}/guice-assistedinject.pom %{short_name}/guice-assistedinject.jar -a org.sonatype.sisu.inject:guice-assistedinject -f assistedinject -install -pm 0644 extensions/throwingproviders/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-throwingproviders.pom +%{mvn_install_pom} extensions/throwingproviders/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-throwingproviders.pom %add_maven_depmap %{short_name}/guice-throwingproviders.pom %{short_name}/guice-throwingproviders.jar -a org.sonatype.sisu.inject:guice-throwingproviders -f throwingproviders -install -pm 0644 extensions/servlet/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-servlet.pom +%{mvn_install_pom} extensions/servlet/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-servlet.pom %add_maven_depmap %{short_name}/guice-servlet.pom %{short_name}/guice-servlet.jar -a org.sonatype.sisu.inject:guice-servlet -f servlet -install -pm 0644 extensions/jndi/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jndi.pom +%{mvn_install_pom} extensions/jndi/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jndi.pom %add_maven_depmap %{short_name}/guice-jndi.pom %{short_name}/guice-jndi.jar -a org.sonatype.sisu.inject:guice-jndi -f jndi -install -pm 0644 extensions/grapher/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-grapher.pom +%{mvn_install_pom} extensions/grapher/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-grapher.pom %add_maven_depmap %{short_name}/guice-grapher.pom %{short_name}/guice-grapher.jar -a org.sonatype.sisu.inject:guice-grapher -f grapher # javadoc From 2af1871f6475987bb0795c92cbe0b3ac23ac7a64465bf587f645fb1c0768d1b2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 22:04:18 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-guice?expand=0&rev=30 --- google-guice.changes | 5 +++++ google-guice.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/google-guice.changes b/google-guice.changes index b5e0f06..d9b1e6f 100644 --- a/google-guice.changes +++ b/google-guice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 22:04:06 UTC 2024 - Fridrich Strba + +- Clean the spec file and simplify it a bit + ------------------------------------------------------------------- Wed May 3 11:27:41 UTC 2023 - Fridrich Strba diff --git a/google-guice.spec b/google-guice.spec index b48328c..8723980 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package google-guice # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed