pool/apparmor
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 852662 from home:dimstar:Factory

Browse Source 
Fix build with new/reworked apache package without breaking compat to previous mode

OBS-URL: https://build.opensuse.org/request/show/852662
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=284
This commit is contained in:
Christian Boltz 2020-12-02 16:27:43 +00:00 committed by Git OBS Bridge
parent 7fc9e62410
commit d058b1185f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apparmor.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 2 14:31:18 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Use apache provided variables for the module_directry:
+ Use %apache_libexecdir
+ Add apache-rpm-macros BuildRequires
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 31 19:05:14 UTC 2020 - Christian Boltz <suse-beta@cboltz.de> Sat Oct 31 19:05:14 UTC 2020 - Christian Boltz <suse-beta@cboltz.de>

4
apparmor.spec
View File

@ -32,7 +32,6 @@
#define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/ #define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/
#define JNI_SO libJNIChangeHat.so #define JNI_SO libJNIChangeHat.so
%define JAR_FILE changeHatValve.jar %define JAR_FILE changeHatValve.jar
%define apache_module_path %(/usr/sbin/apxs2 -q LIBEXECDIR)
Name: apparmor Name: apparmor
Version: 3.0.0 Version: 3.0.0
@ -100,6 +99,7 @@ BuildRequires: ruby-devel
%endif %endif
%if %{with apache} %if %{with apache}
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel BuildRequires: apache2-devel
%endif %endif
@ -685,7 +685,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmor.la
%files -n apache2-mod_apparmor %files -n apache2-mod_apparmor
%defattr(-,root,root) %defattr(-,root,root)
%{apache_module_path}/mod_apparmor.so %{apache_libexecdir}/mod_apparmor.so
%doc %{_mandir}/man8/mod_apparmor.8.gz %doc %{_mandir}/man8/mod_apparmor.8.gz
%endif %endif