Fridrich Strba 2024-10-20 11:03:31 +00:00 committed by Git OBS Bridge
parent 46b27c0d43
commit f30eeffb52
4 changed files with 20 additions and 40 deletions

3
2.1.0.a.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d453efb4af6ab5b5f2387449197b857f1684d59deb017414539e7a8c1c5fb334
size 50411

View File

@ -1,12 +0,0 @@
diff -urEbwB xmlstreambuffer-streambuffer-1.5.4.orig/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java xmlstreambuffer-streambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java
--- xmlstreambuffer-streambuffer-1.5.4.orig/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java 2024-10-19 22:50:52.559472154 +0200
+++ xmlstreambuffer-streambuffer-1.5.4/src/com/sun/xml/stream/buffer/stax/StreamWriterBufferCreator.java 2024-10-19 22:51:00.169524256 +0200
@@ -45,7 +45,7 @@
import org.jvnet.staxex.NamespaceContextEx;
import org.jvnet.staxex.XMLStreamWriterEx;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5099506e5455bb0dc40e956afa811cf45b9fcaf9615c47a4fdcae84bac27ca8e
size 52973

View File

@ -17,20 +17,19 @@
Name: xmlstreambuffer Name: xmlstreambuffer
Version: 1.5.4 Version: 2.1.0.a
Release: 0 Release: 0
Summary: XML Stream Buffer Summary: XML Stream Buffer
License: CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0 License: CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
URL: https://java.net/projects/xmlstreambuffer/ URL: https://github.com/eclipse-ee4j/metro-xmlstreambuffer
Source0: https://github.com/kohsuke/xmlstreambuffer/archive/streambuffer-%{version}.tar.gz Source0: https://github.com/eclipse-ee4j/metro-%{name}/archive/refs/tags/%{version}.tar.gz
Patch0: jakarta.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: stax-ex BuildRequires: mvn(jakarta.activation:jakarta.activation-api)
BuildRequires: mvn(net.java:jvnet-parent:pom:)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.eclipse.ee4j:project:pom:)
BuildRequires: mvn(org.jvnet.staxex:stax-ex) BuildRequires: mvn(org.jvnet.staxex:stax-ex)
BuildArch: noarch BuildArch: noarch
@ -63,42 +62,35 @@ Group: Documentation/HTML
This package contains javadoc for %{name}. This package contains javadoc for %{name}.
%prep %prep
%setup -q -n %{name}-streambuffer-%{version} %setup -q -n metro-%{name}-%{version}
find ./ -name '*.class' -delete pushd streambuffer
find ./ -name '*.jar' -delete
find ./ -name '*.zip' -delete
#patch -P 0 -p1
%pom_remove_plugin :maven-deploy-plugin
%pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-source-plugin
%pom_remove_plugin :findbugs-maven-plugin
%pom_remove_plugin :glassfish-copyright-maven-plugin %pom_remove_plugin :glassfish-copyright-maven-plugin
%pom_remove_plugin :cobertura-maven-plugin
%pom_remove_plugin :buildnumber-maven-plugin %pom_remove_plugin :buildnumber-maven-plugin
%pom_remove_plugin :build-helper-maven-plugin
%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-enforcer-plugin
rm -r test/com/sun/xml/stream/buffer/stax/InscopeNamespaceTest.java
%{mvn_file} :streambuffer %{name} %{mvn_file} :streambuffer %{name}
popd
%build %build
pushd streambuffer
%{mvn_build} -f -- \ %{mvn_build} -f -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-Dmaven.compiler.release=8 \
%endif
-Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
-Dsource=8 -Dsource=8
popd
%install %install
pushd streambuffer
%mvn_install %mvn_install
%fdupes -s %{buildroot}%{_javadocdir} %fdupes -s %{buildroot}%{_javadocdir}
popd
%files -f .mfiles %files -f streambuffer/.mfiles
%license copyright.txt %license LICENSE.md NOTICE.md
%files javadoc -f .mfiles-javadoc %files javadoc -f streambuffer/.mfiles-javadoc
%license copyright.txt %license LICENSE.md NOTICE.md
%changelog %changelog