Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rhino for openSUSE:Factory checked in at 2022-03-15 19:04:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rhino (Old) and /work/SRC/openSUSE:Factory/.rhino.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rhino" Tue Mar 15 19:04:22 2022 rev:37 rq:961469 version:1.7.14 Changes: -------- --- /work/SRC/openSUSE:Factory/rhino/rhino.changes 2020-08-02 12:29:39.839937678 +0200 +++ /work/SRC/openSUSE:Factory/.rhino.new.25692/rhino.changes 2022-03-15 19:05:07.888956720 +0100 @@ -1,0 +2,15 @@ +Sun Mar 13 15:42:53 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Update to 1.7.14 + * split into 3 packages: rhino, rhino-engine and rhino-runtime + * build also the javadoc documentation + * inspired by build.gradle file, write our own ant build.xml + that produces identical jar files + * create scripts using the %%jpackage_script macro + * remove unnecessary dependency on jline1 +- Removed patches: + * rhino-addOrbitManifest.patch + * rhino-build.patch + + not needed since we write our own build system + +------------------------------------------------------------------- Old: ---- Rhino1_7_7_1_RELEASE.tar.gz rhino-1.7.7.1.pom rhino-addOrbitManifest.patch rhino-build.patch rhino-debugger.script rhino-idswitch.script rhino-jsc.script rhino.script New: ---- Rhino1_7_14_Release.tar.gz rhino-1.7.14.pom rhino-build.xml rhino-engine-1.7.14.pom rhino-runtime-1.7.14.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rhino.spec ++++++ --- /var/tmp/diff_new_pack.7650Ee/_old 2022-03-15 19:05:08.612957211 +0100 +++ /var/tmp/diff_new_pack.7650Ee/_new 2022-03-15 19:05:08.612957211 +0100 @@ -1,7 +1,7 @@ # # spec file for package rhino # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -17,28 +17,24 @@ # -%define scm_version 1_7_7_1 +%define scm_version 1_7_14 Name: rhino -Version: 1.7.7.1 +Version: 1.7.14 Release: 0 Summary: JavaScript for Java License: MPL-2.0 Group: Development/Libraries/Java URL: https://www.mozilla.org/rhino/ -Source0: https://github.com/mozilla/rhino/archive/Rhino%{scm_version}_RELEASE.tar.gz +Source0: https://github.com/mozilla/rhino/archive/Rhino%{scm_version}_Release.tar.gz Source1: https://repo1.maven.org/maven2/org/mozilla/rhino/%{version}/rhino-%{version}.pom -Source2: rhino.script -Source3: rhino-debugger.script -Source4: rhino-idswitch.script -Source5: rhino-jsc.script -Patch0: rhino-build.patch -# Add OSGi metadata from Eclipse Orbit project -Patch1: rhino-addOrbitManifest.patch +Source2: https://repo1.maven.org/maven2/org/mozilla/rhino-engine/%{version}/rhino-engine-%{version}.pom +Source3: https://repo1.maven.org/maven2/org/mozilla/rhino-runtime/%{version}/rhino-runtime-%{version}.pom +Source10: %{name}-build.xml BuildRequires: ant -BuildRequires: java-devel >= 1.7 +BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local Requires: javapackages-tools -Requires: jline1 BuildArch: noarch %description @@ -46,6 +42,19 @@ in Java. It is typically embedded into Java applications to provide scripting to end users. +%package engine +Summary: Rhino Engine +Requires: %{name} = %{version} + +%description engine +Rhino Javascript JSR-223 Script Engine wrapper. + +%package runtime +Summary: Rhino Runtime + +%description runtime +Rhino JavaScript runtime jar, excludes tools & JSR-223 Script Engine wrapper. + %package demo Summary: Examples for %{name} Group: Development/Libraries/Java @@ -53,30 +62,30 @@ %description demo Examples for %{name} -%prep -%setup -q -n %{name}-Rhino%{scm_version}_RELEASE -%patch0 -b .build -%patch1 -b .fixManifest -cp %{SOURCE1} pom.xml -%pom_remove_parent +%package javadoc +Summary: API documentation for %{name} +Group: Documentation/HTML -# Fix manifest -sed -i -e '/^Class-Path:.*$/d' src/manifest +%description javadoc +API documentation for %{name}. -# Add jpp release info to version -sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties +%prep +%setup -q -n %{name}-Rhino%{scm_version}_Release +cp %{SOURCE10} build.xml +cp %{SOURCE1} pom.xml +cp %{SOURCE2} pom-engine.xml +cp %{SOURCE3} pom-runtime.xml +%pom_remove_parent pom.xml pom-engine.xml pom-runtime.xml %build -%{ant} \ - -Dtarget-jvm=6 -Dsource-level=6 \ - deepclean jar copy-all +%{ant} jar javadoc pushd examples -export CLASSPATH=../build/%{name}%{version}/js.jar -SOURCEPATH=../build/%{name}%{version}/src -%javac -sourcepath ${SOURCEPATH} -source 6 -target 6 *.java -%jar cvf ../build/%{name}%{version}/%{name}-examples.jar *.class +export CLASSPATH=../target/%{name}-%{version}.jar +SOURCEPATH=../src +%javac -sourcepath ${SOURCEPATH} -source 8 -target 8 *.java +%jar cvf ../target/%{name}-examples-%{version}.jar *.class popd @@ -87,40 +96,60 @@ install -m 644 man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 # jars -mkdir -p %{buildroot}%{_javadir} -cp -a build/%{name}%{version}/js.jar %{buildroot}%{_javadir}/%{name}.jar +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar ln -s %{name}.jar %{buildroot}%{_javadir}/js.jar +install -pm 0644 target/%{name}-engine-%{version}.jar %{buildroot}%{_javadir}/%{name}-engine.jar +install -pm 0644 target/%{name}-runtime-%{version}.jar %{buildroot}%{_javadir}/%{name}-runtime.jar # pom -mkdir -p %{buildroot}%{_mavenpomdir} -cp -a pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +install -dm 0755 %{buildroot}%{_mavenpomdir} +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar -a "rhino:js" +install -pm 0644 pom-engine.xml %{buildroot}%{_mavenpomdir}/%{name}-engine.pom +%add_maven_depmap %{name}-engine.pom %{name}-engine.jar -f engine +install -pm 0644 pom-runtime.xml %{buildroot}%{_mavenpomdir}/%{name}-runtime.pom +%add_maven_depmap %{name}-runtime.pom %{name}-runtime.jar -f runtime + +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir} # scripts -mkdir -p %{buildroot}%{_bindir} -install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/%{name} -install -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}-debugger -install -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/%{name}-idswitch -install -m 0755 %{SOURCE5} %{buildroot}%{_bindir}/%{name}-jsc +%jpackage_script org.mozilla.javascript.tools.shell.Main "" "" rhino rhino true +%jpackage_script org.mozilla.javascript.tools.debugger.Main "" "" rhino rhino-debugger true +%jpackage_script org.mozilla.javascript.tools.jsc.Main "" "" rhino rhino-jsc true # examples -mkdir -p %{buildroot}%{_datadir}/%{name} +install -dm 0755 %{buildroot}%{_datadir}/%{name} cp -a examples/* %{buildroot}%{_datadir}/%{name} -cp -a build/%{name}%{version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar - -find %{buildroot}%{_datadir}/%{name} -name '*.build' -delete +install -pm 0644 target/%{name}-examples-%{version}.jar %{buildroot}%{_javadir}/%{name}-examples.jar +%fdupes -s %{buildroot}%{_datadir}/%{name} %files -f .mfiles -%license LICENSE.txt %attr(0755,root,root) %{_bindir}/%{name} %attr(0755,root,root) %{_bindir}/%{name}-debugger -%attr(0755,root,root) %{_bindir}/%{name}-idswitch %attr(0755,root,root) %{_bindir}/%{name}-jsc %{_javadir}/js.jar %{_javadir}/%{name}-examples.jar %{_mandir}/man1/%{name}.1%{?ext_man} +%license LICENSE.txt NOTICE.txt NOTICE-tools.txt +%doc README.md CODE_OF_CONDUCT.md RELEASE-NOTES.md + +%files engine -f .mfiles-engine +%license LICENSE.txt +%doc README.md CODE_OF_CONDUCT.md RELEASE-NOTES.md + +%files runtime -f .mfiles-runtime +%license LICENSE.txt NOTICE.txt +%doc README.md CODE_OF_CONDUCT.md RELEASE-NOTES.md %files demo %{_datadir}/%{name} +%files javadoc +%license LICENSE.txt +%{_javadocdir}/%{name} + %changelog ++++++ rhino-1.7.7.1.pom -> rhino-1.7.14.pom ++++++ --- /work/SRC/openSUSE:Factory/rhino/rhino-1.7.7.1.pom 2020-08-02 12:29:39.763937599 +0200 +++ /work/SRC/openSUSE:Factory/.rhino.new.25692/rhino-1.7.14.pom 2022-03-15 19:05:07.852956695 +0100 @@ -1,39 +1,31 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> - + <groupId>org.mozilla</groupId> + <artifactId>rhino</artifactId> + <version>1.7.14</version> + <description> + Rhino is an open-source implementation of JavaScript written entirely in Java. + It is typically embedded into Java applications to provide scripting to end users. + Full jar including tools, excluding the JSR-223 Script Engine wrapper. +</description> + <url>https://mozilla.github.io/rhino/</url> <parent> <groupId>org.sonatype.oss</groupId> <artifactId>oss-parent</artifactId> <version>7</version> </parent> - - <groupId>org.mozilla</groupId> - <artifactId>rhino</artifactId> - <name>Mozilla Rhino</name> - <version>1.7.7.1</version> - - <packaging>jar</packaging> - <description> - Rhino is an open-source implementation of JavaScript written entirely in Java. It is typically - embedded into Java applications to provide scripting to end users. - </description> - <url>https://developer.mozilla.org/en/Rhino</url> - <licenses> <license> <name>Mozilla Public License, Version 2.0</name> <url>http://www.mozilla.org/MPL/2.0/index.txt</url> </license> </licenses> - <scm> <connection>scm:git:g...@github.com:mozilla/rhino.git</connection> <developerConnection>scm:git:g...@github.com:mozilla/rhino.git</developerConnection> <url>g...@github.com:mozilla/rhino.git</url> </scm> - <organization> <name>The Mozilla Foundation</name> <url>http://www.mozilla.org</url> ++++++ rhino-build.xml ++++++ <?xml version="1.0" encoding="UTF-8"?> <project name="rhino" default="package" basedir="."> <!-- ====================================================================== --> <!-- Build environment properties --> <!-- ====================================================================== --> <property name="project.groupId" value="org.mozilla"/> <property name="project.artifactId" value="rhino"/> <property name="project.artifactId.engine" value="rhino-engine"/> <property name="project.artifactId.runtime" value="rhino-runtime"/> <property name="project.version" value="1.7.14"/> <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> <property name="build.dir" value="target"/> <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src"/> <property name="build.srcDirTool" value="toolsrc"/> <property name="build.srcDirXmlImpl" value="xmlimplsrc"/> <property name="build.resourceDir" value="src"/> <property name="build.resourceDirTool" value="toolsrc"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> <!-- ====================================================================== --> <!-- Cleaning up target --> <!-- ====================================================================== --> <target name="clean" description="Clean the output directory"> <delete dir="${build.dir}"/> </target> <!-- ====================================================================== --> <!-- Compilation target --> <!-- ====================================================================== --> <target name="compile" description="Compile the code"> <mkdir dir="${build.outputDir}"/> <javac destdir="${build.outputDir}" nowarn="false" debug="true" encoding="utf-8" optimize="false" deprecation="true" target="${compiler.target}" verbose="false" fork="false" source="${compiler.source}"> <src> <pathelement location="${build.srcDir}"/> <pathelement location="${build.srcDirTool}"/> <pathelement location="${build.srcDirXmlImpl}"/> </src> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"> <exclude name="**/*.java"/> </fileset> <fileset dir="${build.resourceDirTool}"> <exclude name="**/*.java"/> </fileset> </copy> </target> <!-- ====================================================================== --> <!-- Javadoc target --> <!-- ====================================================================== --> <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" source="${compiler.source}" verbose="false" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" encoding="utf-8" linksource="false" breakiterator="false"> <sourcepath> <pathelement location="${build.srcDir}"/> <pathelement location="${build.srcDirTool}"/> <pathelement location="${build.srcDirXmlImpl}"/> </sourcepath> </javadoc> </target> <!-- ====================================================================== --> <!-- Package target --> <!-- ====================================================================== --> <target name="package" depends="compile" description="Package the application"> <jar jarfile="${build.dir}/${project.artifactId}-${project.version}.jar" compress="true" index="false" basedir="${build.outputDir}" excludes="**/package.html, org/mozilla/javascript/engine/**, META-INF/services/**"> <manifest> <attribute name="Automatic-Module-Name" value="org.mozilla.rhino"/> <attribute name="Bundle-ManifestVersion" value="2"/> <attribute name="Bundle-SymbolicName" value="org.mozilla.rhino"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="org.mozilla.javascript,org.mozilla.javascript.annotations,org.mozilla.javascript.ast"/> <attribute name="Implementation-Title" value="Mozilla Rhino"/> <attribute name="Implementation-URL" value="http://www.mozilla.org/rhino"/> <attribute name="Implementation-Vendor" value="Mozilla Foundation"/> <attribute name="Implementation-Version" value="${project.version}"/> <attribute name="Main-Class" value="org.mozilla.javascript.tools.shell.Main"/> </manifest> </jar> <jar jarfile="${build.dir}/${project.artifactId.engine}-${project.version}.jar" compress="true" index="false" basedir="${build.outputDir}" includes="**/package.html, org/mozilla/javascript/engine/**, META-INF/services/**"> <manifest> <attribute name="Automatic-Module-Name" value="org.mozilla.rhino.engine"/> <attribute name="Implementation-Title" value="Mozilla Rhino ScriptEngine"/> <attribute name="Implementation-URL" value="http://www.mozilla.org/rhino"/> <attribute name="Implementation-Vendor" value="Mozilla Foundation"/> <attribute name="Implementation-Version" value="${project.version}"/> </manifest> </jar> <jar jarfile="${build.dir}/${project.artifactId.runtime}-${project.version}.jar" compress="true" index="false" basedir="${build.outputDir}" excludes="**/package.html, org/mozilla/javascript/tools/**, org/mozilla/javascript/engine/**, META-INF/services/**"> <manifest> <attribute name="Bundle-ManifestVersion" value="2"/> <attribute name="Bundle-SymbolicName" value="org.mozilla.rhino-runtime"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="org.mozilla.javascript,org.mozilla.javascript.annotations,org.mozilla.javascript.ast"/> <attribute name="Implementation-Title" value="Mozilla Rhino"/> <attribute name="Implementation-URL" value="http://www.mozilla.org/rhino"/> <attribute name="Implementation-Vendor" value="Mozilla Foundation"/> <attribute name="Implementation-Version" value="${project.version}"/> </manifest> </jar> </target> <!-- ====================================================================== --> <!-- A dummy target for the package named after the type it creates --> <!-- ====================================================================== --> <target name="jar" depends="package" description="Builds the jar for the application"/> </project> ++++++ rhino-engine-1.7.14.pom ++++++ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <groupId>org.mozilla</groupId> <artifactId>rhino-engine</artifactId> <version>1.7.14</version> <description> Rhino Javascript JSR-223 Script Engine wrapper. </description> <url>https://mozilla.github.io/rhino/</url> <parent> <groupId>org.sonatype.oss</groupId> <artifactId>oss-parent</artifactId> <version>7</version> </parent> <licenses> <license> <name>Mozilla Public License, Version 2.0</name> <url>http://www.mozilla.org/MPL/2.0/index.txt</url> </license> </licenses> <scm> <connection>scm:git:g...@github.com:mozilla/rhino.git</connection> <developerConnection>scm:git:g...@github.com:mozilla/rhino.git</developerConnection> <url>g...@github.com:mozilla/rhino.git</url> </scm> <organization> <name>The Mozilla Foundation</name> <url>http://www.mozilla.org</url> </organization> <dependencies> <dependency> <groupId>org.mozilla</groupId> <artifactId>rhino</artifactId> <version>1.7.14</version> </dependency> </dependencies> </project> ++++++ rhino-runtime-1.7.14.pom ++++++ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <groupId>org.mozilla</groupId> <artifactId>rhino-runtime</artifactId> <version>1.7.14</version> <description> Rhino JavaScript runtime jar, excludes tools & JSR-223 Script Engine wrapper. </description> <url>https://mozilla.github.io/rhino/</url> <parent> <groupId>org.sonatype.oss</groupId> <artifactId>oss-parent</artifactId> <version>7</version> </parent> <licenses> <license> <name>Mozilla Public License, Version 2.0</name> <url>http://www.mozilla.org/MPL/2.0/index.txt</url> </license> </licenses> <scm> <connection>scm:git:g...@github.com:mozilla/rhino.git</connection> <developerConnection>scm:git:g...@github.com:mozilla/rhino.git</developerConnection> <url>g...@github.com:mozilla/rhino.git</url> </scm> <organization> <name>The Mozilla Foundation</name> <url>http://www.mozilla.org</url> </organization> </project>
