Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package apache2 for openSUSE:Factory checked
in at 2025-01-15 17:42:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2 (Old)
and /work/SRC/openSUSE:Factory/.apache2.new.1881 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2"
Wed Jan 15 17:42:06 2025 rev:214 rq:1237712 version:2.4.62
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2024-11-06
16:49:14.997460221 +0100
+++ /work/SRC/openSUSE:Factory/.apache2.new.1881/apache2.changes
2025-01-15 17:42:09.670100048 +0100
@@ -1,0 +2,8 @@
+Tue Jan 14 08:34:19 UTC 2025 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Fix builds of test package with RPM 4.20:
+ + noarch packages cannot rely on libdir, which is an
+ arch-dependent variable. Rely on apxs -q libdir to extract the
+ correct information instead.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2.spec ++++++
--- /var/tmp/diff_new_pack.b2od82/_old 2025-01-15 17:42:10.950153106 +0100
+++ /var/tmp/diff_new_pack.b2od82/_new 2025-01-15 17:42:10.950153106 +0100
@@ -1,7 +1,7 @@
#
# spec file for package apache2
#
-# 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
@@ -735,6 +735,8 @@
cp %{SOURCE21} mod_example.c
apxs -c mod_example.c
test_dir="$PWD/my-test-devel"
+# hack: %{_libdir} cannot be used in noarch packages, define shell variable
_libdir, using apxs to find the real value
+_libexecdir=$(apxs -q libdir)/apache2
echo "Try to load example module"
mkdir $test_dir
cat > $test_dir/httpd.conf << EOF
@@ -745,7 +747,7 @@
Group $(id -gn)
Listen 60080
DocumentRoot $test_dir
-LoadModule authz_core_module %{libexecdir}-%{default_mpm}/mod_authz_core.so
+LoadModule authz_core_module ${_libexecdir}-%{default_mpm}/mod_authz_core.so
LoadModule example_module $PWD/.libs/mod_example.so
<Location /hello>
SetHandler example-handler
@@ -780,15 +782,17 @@
}
# create a conf loading all MPM's modules
echo > $PWD/load-all-modules.conf
+# hack: %{_libdir} cannot be used in noarch packages, define shell variable
_libdir, using apxs to find the real value
+_libdir=$(apxs -q libdir)
# hack: sort -u to load mod_proxy before mod_proxy_http, mod_cache before
mod_cache_disk, etc.
-modules=$(find %{_libdir}/apache2-%{mpm}/ %{_libdir}/apache2/ -name *.so | sed
's:.*/mod_\(.*\).so:\1:' | sort -u)
+modules=$(find ${_libdir}/apache2-%{mpm}/ ${_libdir}/apache2/ -name *.so | sed
's:.*/mod_\(.*\).so:\1:' | sort -u)
# fix up dependencies
dep "lbmethod_bybusyness" "proxy"
dep "lbmethod_byrequests" "proxy"
dep "lbmethod_bytraffic" "proxy"
dep "lbmethod_heartbeat" "proxy"
for m in $modules; do
- path=$(find %{_libdir}/apache2-%{mpm}/ %{_libdir}/apache2/ -name mod_$m.so |
head -n 1)
+ path=$(find ${_libdir}/apache2-%{mpm}/ ${_libdir}/apache2/ -name mod_$m.so |
head -n 1)
if ! grep -q "mod_$m.c" $PWD/load-all-modules.conf; then
echo "<IfModule !mod_$m.c>" >> $PWD/load-all-modules.conf
echo " LoadModule ${m}_module $path" >> $PWD/load-all-modules.conf
