diff --git a/groovy.spec b/groovy.spec index 67e7ad1e7a1ddfc24315ba4c8ef130574f0cc65d..abc6a0412d9129b6a46b065f23a8c673bf3f7209 100644 --- a/groovy.spec +++ b/groovy.spec @@ -1,6 +1,6 @@ Name: groovy Version: 2.4.8 -Release: 8 +Release: 9 Summary: Dynamic language for the Java Platform License: ASL 2.0 and BSD and EPL and Public Domain and CC-BY URL: http://groovy-lang.org @@ -10,6 +10,7 @@ Source3: groovy.desktop Source4: cpl-v10.txt Source5: epl-v10.txt Source6: http://central.maven.org/maven2/org/codehaus/groovy/groovy-all/%{version}/groovy-all-%{version}.pom +Source7: https://repo1.maven.org/maven2/org/multiverse/multiverse-core/0.7.0/multiverse-core-0.7.0.jar Patch0: 0001-Port-to-Servlet-API-3.1.patch Patch1: 0002-Gradle-local-mode.patch Patch2: 0003-Bintray.patch @@ -19,7 +20,7 @@ Patch5: 0006-Disable-artifactory-publish.patch Patch6: 0007-Fix-missing-extension-definitions.patch BuildRequires: gradle-local >= 2.1-0.9 javapackages-local java-devel >= 1.8 ant antlr-tool ant-antlr -BuildRequires: aqute-bnd gpars multiverse apache-parent testng jline apache-commons-cli apache-commons-beanutils +BuildRequires: aqute-bnd gpars apache-parent testng jline apache-commons-cli apache-commons-beanutils BuildRequires: apache-commons-collections checkstyle jarjar glassfish-jsp-api glassfish-servlet-api BuildRequires: objectweb-asm3 bsf apache-ivy jansi junit xstream desktop-file-utils unzip qdox BuildRequires: mvn(org.apache.ant:ant-junit) mvn(org.apache.ant:ant-launcher) mvn(javax.servlet:servlet-api) mvn(javax.servlet:jsp-api) @@ -119,7 +120,6 @@ ln -sf `build-classpath beust-jcommander` %{buildroot}%{_datadir}/groovy/lib/jco ln -sf `build-classpath jline/jline` %{buildroot}%{_datadir}/groovy/lib/jline.jar ln -sf `build-classpath glassfish-jsp-api` %{buildroot}%{_datadir}/groovy/lib/jsp-api.jar ln -sf `build-classpath junit` %{buildroot}%{_datadir}/groovy/lib/junit.jar -ln -sf `build-classpath multiverse/multiverse-core` %{buildroot}%{_datadir}/groovy/lib/multiverse-core.jar ln -sf `build-classpath qdox` %{buildroot}%{_datadir}/groovy/lib/qdox.jar ln -sf `build-classpath glassfish-servlet-api` %{buildroot}%{_datadir}/groovy/lib/servlet-api.jar ln -sf `build-classpath testng` %{buildroot}%{_datadir}/groovy/lib/testng.jar @@ -127,6 +127,9 @@ ln -sf `build-classpath xpp3-minimal` %{buildroot}%{_datadir}/groovy/lib/xpp3-mi ln -sf `build-classpath xstream/xstream` %{buildroot}%{_datadir}/groovy/lib/xstream.jar ln -sf `build-classpath extra166y` %{buildroot}%{_datadir}/groovy/lib/extra166y.jar +mkdir -p %{buildroot}%{_datadir}/java/multiverse/ +install -p -m 755 %{SOURCE7} %{buildroot}%{_datadir}/java/multiverse/multiverse-core-0.7.0.jar +ln -sf `build-classpath multiverse/multiverse-core-0.7.0` %{buildroot}%{_datadir}/groovy/lib/multiverse-core.jar install -d -m 755 %{buildroot}%{_bindir}/ for cmd in grape groovy groovyc groovyConsole groovydoc groovysh java2groovy; do class=$(awk '/^startGroovy/{print$2}' %{buildroot}%{_datadir}/groovy/bin/$cmd) @@ -180,6 +183,7 @@ EOF %{_datadir}/pixmaps/* %{_datadir}/appdata/*.appdata.xml %{_datadir}/applications/* +%{_datadir}/java/multiverse/* %config(noreplace) %{_sysconfdir}/* %attr(0755,root,root) %dir /usr/share/java/groovy %attr(0644,root,root) %{_datadir}/java/groovy/*.jar @@ -189,5 +193,8 @@ EOF %doc LICENSE NOTICE README.adoc %changelog +* Mon Feb 1 2021 Ge Wang - 2.4.8-9 +- Remove dependence on multiverse + * Thu Dec 7 2019 openEuler Buildteam - 2.4.8-8 - Package init diff --git a/multiverse-core-0.7.0.jar b/multiverse-core-0.7.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..ffaf415a5bd621bab774375c3dad6c10453dd821 Binary files /dev/null and b/multiverse-core-0.7.0.jar differ