From b7aea2a9e7dcb7f0912f917ea8519a9fdc7164fe22c3f2e3ee9af1907a8642d5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 27 Apr 2022 12:32:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-guice?expand=0&rev=22 --- google-guice.spec | 61 +++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/google-guice.spec b/google-guice.spec index 16d7186..b528e0a 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -32,17 +32,13 @@ Patch1: guice-4.1-disabledextensions.patch Patch2: guice-4.1-javadoc.patch Patch3: google-guice-throwingproviderbinder.patch BuildRequires: ant -BuildRequires: aopalliance BuildRequires: aqute-bnd BuildRequires: atinject -BuildRequires: cglib BuildRequires: fdupes BuildRequires: glassfish-servlet-api BuildRequires: guava -BuildRequires: java-devel >= 1.7 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: objectweb-asm -BuildRequires: slf4j Requires: mvn(com.google.guava:guava) Requires: mvn(javax.inject:javax.inject) BuildArch: noarch @@ -229,17 +225,16 @@ done %build mkdir -p lib/build -mkdir -p extensions/servlet/lib/build build-jar-repository -s -p lib/build \ - guava javax.inject glassfish-servlet-api aopalliance cglib objectweb-asm aqute-bnd + guava javax.inject glassfish-servlet-api aqute-bnd %{ant} clean.all no_aop pushd build/no_aop +mkdir -p extensions/servlet/lib/build %pom_remove_dep :aopalliance core %pom_remove_dep :asm core %pom_remove_dep :cglib core -%{ant} -Dversion=%{version} jar -popd %{ant} -Dversion=%{version} dist javadoc +popd %install # jars @@ -250,47 +245,55 @@ ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}-no_aop.jar ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}/%{name}-no_aop.jar -install -pm 0644 build/dist/guice-jmx-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/guice-jmx.jar -install -pm 0644 build/dist/guice-assistedinject-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/guice-assistedinject.jar -install -pm 0644 build/dist/guice-multibindings-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/guice-multibindings.jar -install -pm 0644 build/dist/guice-throwingproviders-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/guice-throwingproviders.jar -install -pm 0644 build/dist/guice-servlet-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/guice-servlet.jar -install -pm 0644 build/dist/guice-jndi-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/guice-jndi.jar -install -pm 0644 build/dist/guice-testlib-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/guice-testlib.jar -install -pm 0644 build/dist/guice-grapher-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/guice-grapher.jar +install -pm 0644 build/no_aop/build/dist/guice-jmx-%{version}.jar \ + %{buildroot}%{_javadir}/%{short_name}/guice-jmx.jar +install -pm 0644 build/no_aop/build/dist/guice-assistedinject-%{version}.jar \ + %{buildroot}%{_javadir}/%{short_name}/guice-assistedinject.jar +install -pm 0644 build/no_aop/build/dist/guice-multibindings-%{version}.jar \ + %{buildroot}%{_javadir}/%{short_name}/guice-multibindings.jar +install -pm 0644 build/no_aop/build/dist/guice-throwingproviders-%{version}.jar \ + %{buildroot}%{_javadir}/%{short_name}/guice-throwingproviders.jar +install -pm 0644 build/no_aop/build/dist/guice-servlet-%{version}.jar \ + %{buildroot}%{_javadir}/%{short_name}/guice-servlet.jar +install -pm 0644 build/no_aop/build/dist/guice-jndi-%{version}.jar \ + %{buildroot}%{_javadir}/%{short_name}/guice-jndi.jar +install -pm 0644 build/no_aop/build/dist/guice-testlib-%{version}.jar \ + %{buildroot}%{_javadir}/%{short_name}/guice-testlib.jar +install -pm 0644 build/no_aop/build/dist/guice-grapher-%{version}.jar \ + %{buildroot}%{_javadir}/%{short_name}/guice-grapher.jar # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{short_name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-parent.pom +install -pm 0644 build/no_aop/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 +install -pm 0644 build/no_aop/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 +install -pm 0644 build/no_aop/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 build/no_aop/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 +install -pm 0644 build/no_aop/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 +install -pm 0644 build/no_aop/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/multibindings/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-multibindings.pom +install -pm 0644 build/no_aop/extensions/multibindings/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-multibindings.pom %add_maven_depmap %{short_name}/guice-multibindings.pom %{short_name}/guice-multibindings.jar -a org.sonatype.sisu.inject:guice-multibindings -f multibindings -install -pm 0644 extensions/throwingproviders/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-throwingproviders.pom +install -pm 0644 build/no_aop/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 +install -pm 0644 build/no_aop/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 +install -pm 0644 build/no_aop/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/testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-testlib.pom +install -pm 0644 build/no_aop/extensions/testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-testlib.pom %add_maven_depmap %{short_name}/guice-testlib.pom %{short_name}/guice-testlib.jar -a org.sonatype.sisu.inject:guice-testlib -f testlib -install -pm 0644 extensions/grapher/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-grapher.pom +install -pm 0644 build/no_aop/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 install -dm 0755 %{buildroot}%{_javadocdir}/%{name} -cp -pr build/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}/ +cp -pr build/no_aop/build/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles