Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sblim-cim-client2 for openSUSE:Factory checked in at 2023-11-06 21:14:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-cim-client2 (Old) and /work/SRC/openSUSE:Factory/.sblim-cim-client2.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sblim-cim-client2" Mon Nov 6 21:14:14 2023 rev:30 rq:1123500 version:2.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-cim-client2/sblim-cim-client2.changes 2022-07-26 19:44:30.467032066 +0200 +++ /work/SRC/openSUSE:Factory/.sblim-cim-client2.new.17445/sblim-cim-client2.changes 2023-11-06 21:14:26.887639656 +0100 @@ -1,0 +2,9 @@ +Fri Nov 3 19:05:37 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Build with any java-devel >= 1.8 +- Modified patch: + * sblim-cim-client2-2.2.5-src.patch + + build with java source and target levels 8 +- Clean the spec a bit and remove some rpmlint errors and warnings + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cim-client2.spec ++++++ --- /var/tmp/diff_new_pack.SCMoyd/_old 2023-11-06 21:14:27.623666749 +0100 +++ /var/tmp/diff_new_pack.SCMoyd/_new 2023-11-06 21:14:27.627666896 +0100 @@ -1,7 +1,7 @@ # # spec file for package sblim-cim-client2 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,36 +24,23 @@ Summary: Java CIM Client library License: EPL-1.0 Group: Development/Libraries/Java -URL: http://sourceforge.net/projects/sblim/ -Source: http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-src.zip -Source1: http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-doc.zip +URL: https://sourceforge.net/projects/sblim/ +Source: https://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-src.zip +Source1: https://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-doc.zip Patch1: sblim-cim-client2-2.2.5-src.patch BuildRequires: ant >= 1.6 BuildRequires: dos2unix -%if %{?suse_version} >= 1500 -BuildRequires: java-devel = 11 -%else BuildRequires: java-devel -%endif BuildRequires: jpackage-utils >= 1.5.32 BuildRequires: unzip Requires: jpackage-utils >= 1.5.32 -Obsoletes: sblim-cim-client <= 1.3.5 -Provides: sblim-cim-client +Obsoletes: sblim-cim-client < %{version} +Provides: sblim-cim-client = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?suse_version} > 1010 BuildRequires: fdupes %endif -%if 0%{?suse_version} -BuildRequires: jaxp_parser_impl -BuildRequires: update-alternatives -BuildRequires: xml-commons-apis -%if 0%{?suse_version} < 1100 -BuildRequires: java-1_5_0-ibm-devel -BuildRequires: java-1_5_0-ibm-fonts -%endif -%endif %description The purpose of this package is to provide a CIM Client Class Library @@ -81,40 +68,40 @@ %setup -q -n %{project_folder} dos2unix COPYING NEWS README ChangeLog sblim-cim-client2.properties sblim-slp-client2.properties find -type f \( -name "*.java" \) -exec dos2unix {} + -%if 0%{?suse_version} > 1200 -# openjdk9 needs source and target 1.6 or larger +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 1.8}%{!?pkg_vcmp:0} %patch1 -p1 %endif -# ----------------------------------------------------------------------------- %build -# export CLASSPATH=$(build-classpath) export ANT_OPTS="-Xmx256m" -ant \ +%{ant} \ -Dbuild.compiler=modern \ -DManifest.version=%{version}\ package java-doc -# ----------------------------------------------------------------------------- %install -# --- documentation --- + +# documentation dstDocDir=%{buildroot}%{_docdir}/%{name}-%{version} install -d $dstDocDir install --mode=644 ChangeLog COPYING README NEWS $dstDocDir -# --- samples (also into _docdir) --- +# samples (also into _docdir) cp -pr smpl/org $dstDocDir -# --- config files --- + +# config files confDir=%{buildroot}%{_sysconfdir}/java install -d $confDir install --mode=664 sblim-cim-client2.properties sblim-slp-client2.properties $confDir -# --- jar --- + +# jar install -d %{buildroot}%{_javadir} install %{archive_folder}/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar ( cd %{buildroot}%{_javadir} && ln -sf %{name}-%{version}.jar %{name}.jar; ) -# --- javadoc --- + +# javadoc mkdir -p %{buildroot}%{_javadocdir} (cd %{buildroot}%{_javadocdir}; unzip %{SOURCE1}) #fix EOL encoding @@ -122,10 +109,9 @@ install -d %{buildroot}%{_javadocdir}/%{name}-%{version} cp -pr %{archive_folder}/doc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -%if 0%{?suse_version} > 1010 +%if 0%{?suse_version} %fdupes %{buildroot} %endif -# ----------------------------------------------------------------------------- %files %defattr(0644,root,root,0755) @@ -146,5 +132,4 @@ %defattr(0644,root,root,0755) %docdir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version} -# ----------------------------------------------------------------------------- ++++++ sblim-cim-client2-2.2.5-src.patch ++++++ --- /var/tmp/diff_new_pack.SCMoyd/_old 2023-11-06 21:14:27.651667780 +0100 +++ /var/tmp/diff_new_pack.SCMoyd/_new 2023-11-06 21:14:27.655667927 +0100 @@ -6,7 +6,7 @@ <mkdir dir="${Directory.build.base}"/> <mkdir dir="${Directory.build.core}"/> - <javac srcdir="${Directory.source.core}" destdir="${Directory.build.core}" debug="on" encoding="utf-8" source="1.5" target="1.5" includeantruntime="false"> -+ <javac srcdir="${Directory.source.core}" destdir="${Directory.build.core}" debug="on" encoding="utf-8" source="1.6" target="1.6" includeantruntime="false"> ++ <javac srcdir="${Directory.source.core}" destdir="${Directory.build.core}" debug="on" encoding="utf-8" source="1.8" target="1.8" includeantruntime="false"> <classpath> <pathelement path="${java.class.path}/"/> </classpath> @@ -15,7 +15,7 @@ <mkdir dir="${Directory.build.base}"/> <mkdir dir="${Directory.build.unittest}"/> - <javac srcdir="${Directory.source.unittest}" destdir="${Directory.build.unittest}" debug="on" encoding="utf-8" source="1.5" target="1.5" includeantruntime="false"> -+ <javac srcdir="${Directory.source.unittest}" destdir="${Directory.build.unittest}" debug="on" encoding="utf-8" source="1.6" target="1.6" includeantruntime="false"> ++ <javac srcdir="${Directory.source.unittest}" destdir="${Directory.build.unittest}" debug="on" encoding="utf-8" source="1.8" target="1.8" includeantruntime="false"> <classpath> <pathelement path="${Directory.build.unittest}/"/> <pathelement path="${Directory.build.core}/"/> @@ -24,7 +24,7 @@ <mkdir dir="${Directory.build.base}"/> <mkdir dir="${Directory.build.samples}"/> - <javac srcdir="${Directory.source.samples}" destdir="${Directory.build.samples}" debug="on" encoding="utf-8" source="1.5" target="1.5" includeantruntime="false"> -+ <javac srcdir="${Directory.source.samples}" destdir="${Directory.build.samples}" debug="on" encoding="utf-8" source="1.6" target="1.6" includeantruntime="false"> ++ <javac srcdir="${Directory.source.samples}" destdir="${Directory.build.samples}" debug="on" encoding="utf-8" source="1.8" target="1.8" includeantruntime="false"> <classpath> <pathelement path="${Directory.build.samples}/"/> <pathelement path="${Directory.build.core}/"/> @@ -33,7 +33,7 @@ encoding="utf-8" docencoding="utf-8" - source ="1.5" -+ source ="1.6" ++ source ="1.8" additionalparam="-quiet" overview="${Directory.source.core}/overview.html" windowtitle="SBLIM CIM Client for Java - ${Manifest.version} - Public API Specification"
