Compare commits

...

No commits in common. "c8s-stream-rhel8" and "c8-stream-201902" have entirely different histories.

View File

@ -1,7 +1,6 @@
Name: jzlib
Version: 1.1.3
Release: 14%{?dist}
Epoch: 0
Release: 10%{?dist}
Summary: Re-implementation of zlib in pure Java
License: BSD
URL: http://www.jcraft.com/jzlib/
@ -29,7 +28,7 @@ Summary: API documentation for %{name}
%package demo
Summary: Examples for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description demo
%{summary}.
@ -38,17 +37,14 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
%setup -q
%patch0
%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" 1.6
%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" 1.6
# Make into OSGi bundle
%pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
%pom_add_plugin "org.apache.felix:maven-bundle-plugin" . "<extensions>true</extensions>"
%mvn_file : %{name}
sed -i -e "s|1.5|1.6|" pom.xml
# Fix javadoc generation on java 11
%pom_xpath_inject pom:build/pom:plugins "<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration><source>1.8</source></configuration>
</plugin>"
%build
%mvn_build
@ -70,23 +66,11 @@ cp -pr example/* %{buildroot}%{_datadir}/%{name}
%doc %{_datadir}/%{name}
%changelog
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.1.3-14
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-10
- Mass rebuild for javapackages-tools 201902
* Thu Jun 25 2020 Alexander Kurtakov <akurtako@redhat.com> 0:1.1.3-13
- Fix build with Java 11.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-9
- Mass rebuild for javapackages-tools 201901
* Wed Mar 21 2018 Mat Booth <mat.booth@redhat.com> - 0:1.1.3-8
- Add OSGi metadata