diff --git a/apache2-mod_nss.changes b/apache2-mod_nss.changes index b310446..2b2b281 100644 --- a/apache2-mod_nss.changes +++ b/apache2-mod_nss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 25 09:20:54 UTC 2020 - pgajdos@suse.com + +- use apache rpm macros + ------------------------------------------------------------------- Thu Jun 11 09:53:59 UTC 2020 - Paolo Stivanin diff --git a/apache2-mod_nss.spec b/apache2-mod_nss.spec index 6fc8666..462dd8c 100644 --- a/apache2-mod_nss.spec +++ b/apache2-mod_nss.spec @@ -16,13 +16,15 @@ # -%define apxs %{_sbindir}/apxs2 +%if ! %{defined apache_apxs} +%define apache_apxs %{_sbindir}/apxs %define apache apache2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) %define apache_sysconfdir %(%{apxs} -q SYSCONFDIR) %define apache_includedir %(%{apxs} -q INCLUDEDIR) %define apache_serverroot %(%{apxs} -q PREFIX) %define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) +%endif %define apache_sysconf_nssdir %{apache_sysconfdir}/mod_nss.d Name: apache2-mod_nss Version: 1.0.18 @@ -101,7 +103,7 @@ autoreconf -fvi --with-nss-inc=$NSS_INCLUDE_DIR \ --with-nspr-lib=$NSPR_LIB_DIR \ --with-nspr-inc=$NSPR_INCLUDE_DIR \ - --with-apxs=%{apxs} \ + --with-apxs=%{apache_apxs} \ --enable-ecc \ --with-apr-config make %{?_smp_mflags} all