mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-03 07:45:50 +00:00
Code Issues Releases Wiki Activity

Two changes:

Browse Source 
* patch from SUSE autobuild team to not strip binaries
* convert rpm release for the parser and mod_apparmor packages to
  correspond to the svn repository number.
This commit is contained in:
Steve Beattie
2006-05-31 22:38:30 +00:00
parent 08a4b5ce52
commit 865b21c761
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
changehat/mod_apparmor/apache2-mod-apparmor.spec.in
View File

@@ -28,7 +28,7 @@
Summary: AppArmor module for apache2. Summary: AppArmor module for apache2.
Name: apache2-mod-apparmor Name: apache2-mod-apparmor
Version: @@immunix_version@@ Version: @@immunix_version@@
Release: 8 Release: @@repo_version@@
Group: Applications/System Group: Applications/System
Source0: %{name}-%{version}-@@repo_version@@.tar.gz Source0: %{name}-%{version}-@@repo_version@@.tar.gz
License: LGPL License: LGPL
@@ -69,12 +69,8 @@ This package is part of a suite of tools that used to be named SubDomain.
%build %build
make %{module_name}.so APXS=%{apxs} make %{module_name}.so APXS=%{apxs}
%{__strip} -g %{module_name}.so
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT} DISTRO=%{distro} make install DESTDIR=${RPM_BUILD_ROOT} DISTRO=%{distro}
%if %{distro} == "suse" %if %{distro} == "suse"
@@ -134,6 +130,8 @@ make install DESTDIR=${RPM_BUILD_ROOT} DISTRO=%{distro}
%endif %endif
%changelog %changelog
* Fri May 26 2006 - schwab@suse.de
- Don't strip binaries.
* Wed Apr 12 2006 - Steve Beattie <sbeattie@suse.de> * Wed Apr 12 2006 - Steve Beattie <sbeattie@suse.de>
- Move to novell forge svn repo; fix build issue with new layout - Move to novell forge svn repo; fix build issue with new layout
* Thu Mar 30 2006 - Seth Arnold <seth.arnold@suse.de> 2.0-7.2 * Thu Mar 30 2006 - Seth Arnold <seth.arnold@suse.de> 2.0-7.2

1
parser/Makefile
View File

@@ -215,7 +215,6 @@ endif
.PHONY: install .PHONY: install
install: $(INSTALLDEPS) install: $(INSTALLDEPS)
strip $(TOOLS)
install -m 755 -d $(DESTDIR)/sbin install -m 755 -d $(DESTDIR)/sbin
install -m 755 ${TOOLS} $(DESTDIR)/sbin install -m 755 ${TOOLS} $(DESTDIR)/sbin
install -m 755 -d $(INSTALL_CONFDIR) install -m 755 -d $(INSTALL_CONFDIR)

7
parser/apparmor-parser.spec.in
View File

@@ -25,7 +25,7 @@
Summary: AppArmor userlevel parser utility. Summary: AppArmor userlevel parser utility.
Name: apparmor-parser Name: apparmor-parser
Version: @@immunix_version@@ Version: @@immunix_version@@
Release: 15 Release: @@repo_version@@
Group: Applications/System Group: Applications/System
Source0: %{name}-%{version}-@@repo_version@@.tar.gz Source0: %{name}-%{version}-@@repo_version@@.tar.gz
License: GPL License: GPL
@@ -61,15 +61,12 @@ This package is part of a suite of tools that used to be named SubDomain.
%setup -q %setup -q
%build %build
[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf $RPM_BUILD_ROOT
make clean all CFLAGS="${RPM_OPT_FLAGS}" make clean all CFLAGS="${RPM_OPT_FLAGS}"
%install %install
[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT} \ make install DESTDIR=${RPM_BUILD_ROOT} \
DISTRO=%{distro} \ DISTRO=%{distro} \
APPARMOR_BIN_PREFIX=${RPM_BUILD_ROOT}%{apparmor_bin_prefix} APPARMOR_BIN_PREFIX=${RPM_BUILD_ROOT}%{apparmor_bin_prefix}
strip ${RPM_BUILD_ROOT}/sbin/apparmor_parser
%clean %clean
[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf $RPM_BUILD_ROOT [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -165,6 +162,8 @@ fi
%changelog %changelog
* Fri May 26 2006 - schwab@suse.de
- Don't strip binaries.
* Thu Apr 27 2006 Steve beattie <sbeattie@suse.de> * Thu Apr 27 2006 Steve beattie <sbeattie@suse.de>
- Fix segv if profile dirs don't exist (#160330) - Fix segv if profile dirs don't exist (#160330)
* Tue Apr 11 2006 Steve Beattie <sbeattie@suse.de> * Tue Apr 11 2006 Steve Beattie <sbeattie@suse.de>