Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package conscrypt for openSUSE:Factory
checked in at 2025-03-27 22:34:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/conscrypt (Old)
and /work/SRC/openSUSE:Factory/.conscrypt.new.2696 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "conscrypt"
Thu Mar 27 22:34:22 2025 rev:2 rq:1264614 version:2.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/conscrypt/conscrypt.changes 2024-10-12
13:35:45.549242476 +0200
+++ /work/SRC/openSUSE:Factory/.conscrypt.new.2696/conscrypt.changes
2025-03-27 22:35:01.919388088 +0100
@@ -1,0 +2,5 @@
+Thu Mar 27 15:30:37 UTC 2025 - Fridrich Strba <fst...@suse.com>
+
+- Fix build with both xmvn-mojo:javadoc and javadoc:aggregate
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ conscrypt.spec ++++++
--- /var/tmp/diff_new_pack.0nZt0a/_old 2025-03-27 22:35:02.499412096 +0100
+++ /var/tmp/diff_new_pack.0nZt0a/_new 2025-03-27 22:35:02.503412262 +0100
@@ -1,7 +1,7 @@
#
# spec file for package conscrypt
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -116,24 +116,28 @@
env -Cconstants g++ src/gen/cpp/generate_constants.cc -o generate_constants
./constants/generate_constants
>openjdk/src/main/java/org/conscrypt/NativeConstants.java
+pushd openjdk
%{mvn_alias} :{*} :@1-uber
%{mvn_build} -f -- \
- -f openjdk -Dsource=8
+ -Dsource=8
+popd
%install
+pushd openjdk
%mvn_install
%fdupes %{buildroot}%{_javadocdir}/%{name}
# This helps to generate the right requires on boringssl and eventually,
# we might patch the library loading to consider just this one
install -dm 0755 %{buildroot}%{_libdir}/%{name}
-install -pm 0755 openjdk/build/libconscrypt_jni.so
%{buildroot}%{_libdir}/%{name}/
+install -pm 0755 build/libconscrypt_jni.so %{buildroot}%{_libdir}/%{name}/
+popd
-%files -f .mfiles
+%files -f openjdk/.mfiles
%{_libdir}/%{name}
%license LICENSE NOTICE
%doc {README,IMPLEMENTATION_NOTES,CAPABILITIES}.md
-%files javadoc -f .mfiles-javadoc
+%files javadoc -f openjdk/.mfiles-javadoc
%license LICENSE NOTICE
