SPECS/jzlib.spec

@@ -1,6 +1,7 @@
 Name:           jzlib
 Version:        1.1.3
-Release:        21%{?dist}
+Release:        14%{?dist}
+Epoch:          0
 Summary:        Re-implementation of zlib in pure Java
 License:        BSD
 URL:            http://www.jcraft.com/jzlib/
@@ -28,23 +29,26 @@ Summary:        API documentation for %{name}
 
 %package        demo
 Summary:        Examples for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description    demo
 %{summary}.
 
 %prep
 %setup -q
-%patch -P 0
-
-%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
+%patch0
 
 # 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
@@ -66,27 +70,8 @@ cp -pr example/* %{buildroot}%{_datadir}/%{name}
 %doc %{_datadir}/%{name}
 
 %changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1.1.3-21
-- Fix patch usage
-
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1.1.3-20
-- Rebuild with regenerated Requires on Java
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-19
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-18
-- Convert sources to SHA512
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0:1.1.3-17
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0:1.1.3-14
+- Rebuilt for MSVSphere 8.8
 
 * 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
@@ -97,15 +82,9 @@ cp -pr example/* %{buildroot}%{_datadir}/%{name}
 * 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
 
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-10
-- Mass rebuild for javapackages-tools 201902
-
 * 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 May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-9
-- Mass rebuild for javapackages-tools 201901
-
 * 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