From 19f8cb595dc1b58c372e30c11888fe3dcdddbc5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 16 Mar 2010 21:53:50 +0000 Subject: [PATCH 1/1] - install man pages Changed files: apparmor-parser-make.patch -> 1.4 apparmor-parser.spec -> 1.26 --- apparmor-parser-make.patch | 12 +++++++++--- apparmor-parser.spec | 8 ++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/apparmor-parser-make.patch b/apparmor-parser-make.patch index f450ef3..4e89e41 100644 --- a/apparmor-parser-make.patch +++ b/apparmor-parser-make.patch @@ -1,6 +1,6 @@ --- parser.org/Makefile 2010-03-11 08:28:38.000000000 +0100 -+++ parser/Makefile 2010-03-16 22:42:34.830028680 +0100 -@@ -125,9 +125,12 @@ ++++ parser/Makefile 2010-03-16 22:48:58.089964565 +0100 +@@ -125,9 +125,18 @@ techdoc.txt: techdoc/index.html w3m -dump $< > $@ @@ -9,7 +9,13 @@ $(Q)make -C po all - $(Q)make -s tests + -+docs: $(MANPAGES) ${HTMLMANPAGES} ++manpages: $(MANPAGES) ++ ++htmlmanpages: $(HTMLMANPAGES) ++ ++pdf: techdoc.pdf ++ ++docs: manpages htmlmanpages pdf + +all: main docs tests diff --git a/apparmor-parser.spec b/apparmor-parser.spec index ff29549..da4e307 100644 --- a/apparmor-parser.spec +++ b/apparmor-parser.spec @@ -40,7 +40,7 @@ cd parser %patch0 -p1 %build -%{__make} -C parser main \ +%{__make} -C parser main manpages \ CC="%{__cc}" \ CXX="%{__cxx}" \ CFLAGS="%{rpmcflags} %{rpmcppflags}" @@ -51,12 +51,15 @@ cd parser rm -rf $RPM_BUILD_ROOT cd parser -install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{apparmor,rc.d/init.d},/sbin,/subdomain,/var/lib/apparmor} +install -d $RPM_BUILD_ROOT{%{_mandir}/man{5,7,8},%{_sysconfdir}/{apparmor,rc.d/init.d},/sbin,/subdomain,/var/lib/apparmor} install apparmor_parser $RPM_BUILD_ROOT/sbin install subdomain.conf $RPM_BUILD_ROOT%{_sysconfdir}/apparmor install rc.apparmor.functions $RPM_BUILD_ROOT%{_sysconfdir}/apparmor install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/apparmor +install *.5 $RPM_BUILD_ROOT%{_mandir}/man5 +install *.7 $RPM_BUILD_ROOT%{_mandir}/man7 +install *.8 $RPM_BUILD_ROOT%{_mandir}/man8 %{__make} -C po install \ DESTDIR=$RPM_BUILD_ROOT \ @@ -87,3 +90,4 @@ fi #%attr(754,root,root) /etc/rc.d/init.d/aaeventd /subdomain /var/lib/apparmor +%{_mandir}/man[578]/*.[578]* -- 2.44.0