Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package syslog-ng for openSUSE:Factory
checked in at 2022-03-09 18:48:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/syslog-ng (Old)
and /work/SRC/openSUSE:Factory/.syslog-ng.new.2349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syslog-ng"
Wed Mar 9 18:48:06 2022 rev:115 rq:960481 version:3.35.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/syslog-ng/syslog-ng.changes 2022-02-18
23:03:42.185409280 +0100
+++ /work/SRC/openSUSE:Factory/.syslog-ng.new.2349/syslog-ng.changes
2022-03-11 11:36:30.070283815 +0100
@@ -1,0 +2,11 @@
+Tue Mar 8 12:02:19 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * syslog-ng-nojavah.patch
+ + Do not use the removed javah tool, but the javac's -h option
+ + Allows to build with any java-devel >= 1.8
+- Require java-devel >= 1.8 for build
+- Add build dependency on autoconf and automake since we need them
+ to regenerate the build system after we patch it
+
+-------------------------------------------------------------------
New:
----
syslog-ng-nojavah.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syslog-ng.spec ++++++
--- /var/tmp/diff_new_pack.TveJYJ/_old 2022-03-11 11:36:30.574284406 +0100
+++ /var/tmp/diff_new_pack.TveJYJ/_new 2022-03-11 11:36:30.578284411 +0100
@@ -67,6 +67,9 @@
Source2: syslog-ng.conf.default
Source3: syslog-ng.service
Source4: syslog-ng-service-prepare
+Patch0: syslog-ng-nojavah.patch
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: bison
BuildRequires: flex
BuildRequires: gcc-c++
@@ -111,7 +114,7 @@
BuildRequires: libdbi-devel
%endif
%if %{with java}
-BuildRequires: java-devel < 1.11
+BuildRequires: java-devel >= 1.8
%endif
%if %{with python}
BuildRequires: python3-devel
@@ -241,9 +244,9 @@
%description mqtt
This package provides MQTT support for syslog-ng
-
%prep
%setup -q -n syslog-ng-%{version}
+%patch0 -p1
# fill out placeholders in the config,
# systemd service and prepare script.
for file in \
@@ -266,6 +269,7 @@
# touch -r lib/cfg-grammar.y lib/merge-grammar.py
%build
+autoreconf -fi
##
## build ####################################################
##
++++++ syslog-ng-nojavah.patch ++++++
--- syslog-ng-3.35.1/modules/java/Makefile.am 2021-11-15 11:06:24.000000000
+0100
+++ syslog-ng-3.35.1/modules/java/Makefile.am 2022-03-08 12:59:15.986822666
+0100
@@ -55,8 +55,7 @@
$(SYSLOG_NG_CORE_LIBS_DIR) $(SYSLOG_NG_CORE_CLASSES_DIR)
$(SYSLOG_NG_CORE_PACKAGE_DIR) $(JAVA_BUILDDIR):
mkdir -p $@
-$(JAVA_HEADER_FILES): $(JAVA_BUILDDIR)/org_syslog_ng_%.h:
$(SYSLOG_NG_CORE_PACKAGE_DIR)/%.class
- $(AM_V_GEN)$(JAVAH) -classpath $(SYSLOG_NG_CORE_CLASSES_DIR) -d
$(JAVA_BUILDDIR) org.syslog_ng.$*
+$(JAVA_HEADER_FILES): $(JAVA_CLASS_FILES)
all-local: java-binaries java-headers
@@ -147,7 +146,7 @@
# this needs to come after .SECONDEXPANSION
$(JAVA_CLASS_FILES): $(SYSLOG_NG_CORE_PACKAGE_DIR)/%.class:
$(SYSLOG_NG_CORE_SRC_DIR)/%.java $(SYSLOG_NG_CORE_CLASSES_DIR)
$$($$*_CLASS_DEPS)
- $(AM_V_GEN)$(JAVAC) -classpath $(SYSLOG_NG_CORE_CLASSES_DIR) -d
$(SYSLOG_NG_CORE_CLASSES_DIR) $<
+ $(AM_V_GEN)$(JAVAC) -classpath $(SYSLOG_NG_CORE_CLASSES_DIR) -d
$(SYSLOG_NG_CORE_CLASSES_DIR) -h $(JAVA_BUILDDIR) $<
endif
