Hello community,
here is the log from the commit of package glassfish-jsp-api for
openSUSE:Factory checked in at 2019-11-04 17:15:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glassfish-jsp-api (Old)
and /work/SRC/openSUSE:Factory/.glassfish-jsp-api.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glassfish-jsp-api"
Mon Nov 4 17:15:05 2019 rev:3 rq:744772 version:2.3.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/glassfish-jsp-api/glassfish-jsp-api.changes
2019-10-03 14:09:58.428020924 +0200
+++
/work/SRC/openSUSE:Factory/.glassfish-jsp-api.new.2990/glassfish-jsp-api.changes
2019-11-04 17:15:12.344825163 +0100
@@ -1,0 +2,7 @@
+Fri Nov 1 09:31:46 UTC 2019 - Fridrich Strba <[email protected]>
+
+- Generate tarball using source services
+- Take the LICENSE file from the git repository and LICENSE-2.0
+ from Apache
+
+-------------------------------------------------------------------
Old:
----
LICENSE-2.0.txt
LICENSE.html
generate_tarball.sh
New:
----
LICENSE
LICENSE-2.0
_service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glassfish-jsp-api.spec ++++++
--- /var/tmp/diff_new_pack.NsqHE1/_old 2019-11-04 17:15:14.572827543 +0100
+++ /var/tmp/diff_new_pack.NsqHE1/_new 2019-11-04 17:15:14.576827547 +0100
@@ -25,11 +25,9 @@
Group: Development/Libraries/Java
URL: http://java.net/jira/browse/JSP
Source0: %{artifactId}-%{version}.tar.xz
-# Generate API tarball from a git tag
-Source1: generate_tarball.sh
-Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
-Source3: https://javaee.github.io/glassfish/LICENSE.html
-Source4: %{name}-build.xml
+Source1:
https://raw.githubusercontent.com/javaee/javaee-jsp-api/%{artifactId}-%{version}/LICENSE
+Source2: http://www.apache.org/licenses/LICENSE-2.0
+Source3: %{name}-build.xml
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: glassfish-el-api
@@ -55,9 +53,9 @@
%prep
%setup -q -n %{artifactId}-%{version}
-cp -p %{SOURCE2} LICENSE-ASL-2.0.txt
-cp -p %{SOURCE3} LICENSE-CDDL+GPLv2.html
-cp -p %{SOURCE4} build.xml
+cp -p %{SOURCE1} .
+cp -p %{SOURCE2} .
+cp -p %{SOURCE3} build.xml
# Submited upstream: http://java.net/jira/browse/JSP-31
sed -i "/<bundle.symbolicName>/s/-api//" pom.xml
@@ -91,10 +89,10 @@
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles
-%license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html
+%license LICENSE LICENSE-2.0
%files javadoc
-%license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html
+%license LICENSE LICENSE-2.0
%{_javadocdir}/%{name}
%changelog
++++++ LICENSE ++++++
++++ 759 lines (skipped)
++++++ LICENSE-2.0.txt -> LICENSE-2.0 ++++++
++++++ _service ++++++
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param
name="url">https://github.com/javaee/javaee-jsp-api</param>
<param name="revision">javax.servlet.jsp-api-2.3.3</param>
<param name="versionformat">2.3.3</param>
<param name="subdir">api</param>
<param name="filename">javax.servlet.jsp-api</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>
++++++ javax.servlet.jsp-api-2.3.3.tar.xz ++++++
