diff --git a/google-guice.spec b/google-guice.spec index 2f97d3a..a14273e 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -201,7 +201,6 @@ find . -name "*.class" -delete %pom_xpath_remove "pom:dependency[pom:classifier[text()='tests']]" extensions %pom_remove_parent -%pom_set_parent com.google.inject:guice-parent:%{version} jdk8-tests %pom_disable_module persist extensions %pom_disable_module spring extensions @@ -222,15 +221,6 @@ find . -name "*.class" -delete %pom_xpath_remove "pom:optional" core %build -%{mvn_alias} "com.google.inject.extensions:" "org.sonatype.sisu.inject:" - -%{mvn_package} :::no_aop: guice -%{mvn_package} :{*} @1 - -%{mvn_file} ":guice-{*}" %{short_name}/guice-@1 -%{mvn_file} ":guice" %{short_name}/%{name} %{name} -%{mvn_alias} ":guice" "org.sonatype.sisu:sisu-guice" - mkdir -p lib/build mkdir -p extensions/servlet/lib/build build-jar-repository -s -p lib/build \ @@ -242,59 +232,91 @@ pushd build/no_aop popd %{ant} -Dversion=%{version} dist javadoc -%{mvn_artifact} pom.xml -%{mvn_artifact} bom/pom.xml -%{mvn_artifact} build/no_aop/core/pom.xml build/no_aop/build/guice-%{version}.jar -# a huge hack to force the no_aop classifier to the version 2.3.0 reactor -perl -pi -e 's#guice#guiceno_aop#g' .xmvn-reactor -%{mvn_artifact} core/pom.xml build/guice-%{version}.jar -%{mvn_artifact} extensions/pom.xml -%{mvn_artifact} extensions/jmx/pom.xml build/dist/guice-jmx-%{version}.jar -%{mvn_artifact} extensions/assistedinject/pom.xml build/dist/guice-assistedinject-%{version}.jar -%{mvn_artifact} extensions/multibindings/pom.xml build/dist/guice-multibindings-%{version}.jar -%{mvn_artifact} extensions/throwingproviders/pom.xml build/dist/guice-throwingproviders-%{version}.jar -%{mvn_artifact} extensions/servlet/pom.xml build/dist/guice-servlet-%{version}.jar -%{mvn_artifact} extensions/jndi/pom.xml build/dist/guice-jndi-%{version}.jar -%{mvn_artifact} extensions/testlib/pom.xml build/dist/guice-testlib-%{version}.jar -%{mvn_artifact} extensions/grapher/pom.xml build/dist/guice-grapher-%{version}.jar - %install -%mvn_install -J build/docs/javadoc +# jars +install -dm 0755 %{buildroot}%{_javadir}/%{short_name} +install -pm 0644 build/no_aop/build/guice-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}-no_aop.jar +ln -sf %{short_name}/%{name}-no_aop.jar %{buildroot}%{_javadir}/%{name}-no_aop.jar +install -pm 0644 build/guice-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}.jar +ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}/%{name}.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 + +# poms +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{short_name} +install -pm 0644 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 +%add_maven_depmap %{short_name}/guice-bom.pom -f bom + +install -pm 0644 build/no_aop/core/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/%{name}-no_aop.pom +%add_maven_depmap %{short_name}/%{name}-no_aop.pom %{short_name}/%{name}-no_aop.jar -a org.sonatype.sisu:sisu-guice::no_aop: +# a huge hack to force the no_aop classifier to the version 2.3.0 reactor +perl -pi -e 's#guice#guiceno_aop#g' %{buildroot}%{_datadir}/maven-metadata/%{name}.xml +install -pm 0644 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 + +install -pm 0644 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 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 +%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 +%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 +%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 +%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 +%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 +%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 +%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}/ %fdupes -s %{buildroot}%{_javadocdir} -%files -f .mfiles-guice +%files -f .mfiles %dir %{_javadir}/%{short_name} +%{_javadir}/%{name}*.jar -%files -n %{short_name}-parent -f .mfiles-guice-parent +%files -n %{short_name}-parent -f .mfiles-parent %license COPYING -%files -n %{short_name}-assistedinject -f .mfiles-guice-assistedinject +%files -n %{short_name}-assistedinject -f .mfiles-assistedinject -%files -n %{short_name}-extensions -f .mfiles-extensions-parent +%files -n %{short_name}-extensions -f .mfiles-extensions -%files -n %{short_name}-grapher -f .mfiles-guice-grapher +%files -n %{short_name}-grapher -f .mfiles-grapher -%files -n %{short_name}-jmx -f .mfiles-guice-jmx +%files -n %{short_name}-jmx -f .mfiles-jmx -%files -n %{short_name}-jndi -f .mfiles-guice-jndi +%files -n %{short_name}-jndi -f .mfiles-jndi -%files -n %{short_name}-multibindings -f .mfiles-guice-multibindings -%if %{with jpa} -%files -n %{short_name}-persist -f .mfiles-guice-persist -%endif +%files -n %{short_name}-multibindings -f .mfiles-multibindings -%files -n %{short_name}-servlet -f .mfiles-guice-servlet -%if %{with spring} -%files -n %{short_name}-spring -f .mfiles-guice-spring -%endif +%files -n %{short_name}-servlet -f .mfiles-servlet -%files -n %{short_name}-testlib -f .mfiles-guice-testlib +%files -n %{short_name}-testlib -f .mfiles-testlib -%files -n %{short_name}-throwingproviders -f .mfiles-guice-throwingproviders +%files -n %{short_name}-throwingproviders -f .mfiles-throwingproviders -%files -n %{short_name}-bom -f .mfiles-guice-bom +%files -n %{short_name}-bom -f .mfiles-bom -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license COPYING %changelog