Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jansi for openSUSE:Factory checked in at 2024-09-30 15:34:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jansi (Old) and /work/SRC/openSUSE:Factory/.jansi.new.29891 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jansi" Mon Sep 30 15:34:45 2024 rev:7 rq:1204584 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jansi/jansi.changes 2023-04-27 20:01:01.361956638 +0200 +++ /work/SRC/openSUSE:Factory/.jansi.new.29891/jansi.changes 2024-09-30 15:34:58.103455913 +0200 @@ -1,0 +2,5 @@ +Sun Sep 29 19:48:37 UTC 2024 - Fridrich Strba <[email protected]> + +- Fix build after removal of the default %%{java_home} define + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jansi.spec ++++++ --- /var/tmp/diff_new_pack.x5DX95/_old 2024-09-30 15:34:58.591476163 +0200 +++ /var/tmp/diff_new_pack.x5DX95/_new 2024-09-30 15:34:58.591476163 +0200 @@ -1,7 +1,7 @@ # # spec file for package jansi # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ BuildRequires: ant BuildRequires: fdupes BuildRequires: gcc -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 %description Jansi is a java library that allows you to use ANSI escape sequences @@ -67,8 +67,8 @@ %pom_xpath_set "//pom:properties/pom:jdkTarget" 1.8 # Link the JNI headers -ln -s %{java_home}/include/jni.h src/main/native/inc_linux -ln -s %{java_home}/include/linux/jni_md.h src/main/native/inc_linux +ln -s %{_jvmdir}/java/include/jni.h src/main/native/inc_linux +ln -s %{_jvmdir}/java/include/linux/jni_md.h src/main/native/inc_linux # Set the JNI path sed -i 's,@LIBDIR@,%{_libdir},' \ @@ -79,13 +79,13 @@ %build # Build the native artifact -CFLAGS="$CFLAGS -I. -I%{java_home}/include -I%{java_home}/include/linux -fPIC -fvisibility=hidden" +CFLAGS="$CFLAGS -I. -fPIC -fvisibility=hidden" pushd src/main/native -%__cc $CFLAGS -c jansi.c -%__cc $CFLAGS -c jansi_isatty.c -%__cc $CFLAGS -c jansi_structs.c -%__cc $CFLAGS -c jansi_ttyname.c -%__cc $CFLAGS $LDFLAGS -shared -o libjansi.so *.o -lutil +gcc $CFLAGS -c jansi.c +gcc $CFLAGS -c jansi_isatty.c +gcc $CFLAGS -c jansi_structs.c +gcc $CFLAGS -c jansi_ttyname.c +gcc $CFLAGS $LDFLAGS -shared -o libjansi.so *.o -lutil popd # Build the Java artifacts @@ -101,7 +101,7 @@ install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_jnidir}/%{name}/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar # javadoc %fdupes -s %{buildroot}%{_javadocdir}
