Hello community,
here is the log from the commit of package apache2-mod_evasive for
openSUSE:Factory checked in at 2014-11-10 17:28:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_evasive (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_evasive.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_evasive"
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2-mod_evasive/apache2-mod_evasive.changes
2014-10-15 08:52:18.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.apache2-mod_evasive.new/apache2-mod_evasive.changes
2014-11-10 17:28:46.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Oct 31 08:34:11 UTC 2014 - pgaj...@suse.com
+
+- use apache rpm macros
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_evasive.spec ++++++
--- /var/tmp/diff_new_pack.lbZN0C/_old 2014-11-10 17:28:47.000000000 +0100
+++ /var/tmp/diff_new_pack.lbZN0C/_new 2014-11-10 17:28:47.000000000 +0100
@@ -16,6 +16,11 @@
#
+%if "%apache_branch" == "2.4"
+%define ap_suffix 24
+%else
+%define ap_suffix 20
+%endif
Name: apache2-mod_evasive
Version: 1.10.1
Release: 0
@@ -33,24 +38,12 @@
Source2: mod_evasive.conf
Patch1: modev-return.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel
BuildRequires: apache2-prefork
BuildRequires: curl-devel
BuildRequires: gcc-c++
BuildRequires: pcre-devel
-
-%define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o
"2\\.[0-9]+")
-%if "%{apache_branch}" == "2.4"
- %define ap_suffix 24
- %define apxs %{_bindir}/apxs2
-%else
- %define ap_suffix 20
- %define apxs %{_sbindir}/apxs2
-%endif
-%define apache_libexecdir %(%apxs -q LIBEXECDIR)
-%define apache_sysconfdir %(%apxs -q SYSCONFDIR)
-%define apache_mmn %(MMN=$(%apxs -q LIBEXECDIR)_MMN; test -x $MMN &&
$MMN)
-
Requires: %apache_mmn
Requires: apache2
@@ -75,13 +68,13 @@
sed -i 's/evasive20_module/evasive24_module/' mod_evasive%{ap_suffix}.c
sed -i 's/evasive20/evasive24/g' mod_evasive.conf
%endif
-%apxs -Wc,"%{optflags}" -c mod_evasive%{ap_suffix}.c
+%apache_apxs -Wc,"%{optflags}" -c mod_evasive%{ap_suffix}.c
%install
b="%buildroot"
mkdir -p "$b/%apache_libexecdir" "$b/%apache_sysconfdir/conf.d"
-%apxs -i -S LIBEXECDIR="%buildroot/%apache_libexecdir" \
+%apache_apxs -i -S LIBEXECDIR="%buildroot/%apache_libexecdir" \
-n mod_evasive%{ap_suffix}.so mod_evasive%{ap_suffix}.la;
cp -a mod_evasive.conf "$b/%apache_sysconfdir/conf.d/";
perl -i -pe "s{/usr/lib/}{%_libdir/}g" \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
