packages: apparmor-parser/apparmor-parser-make.patch, apparmor-parser/appar...

[arekm]

Author: arekm                        Date: Tue Mar 16 21:53:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install man pages

---- Files affected:
packages/apparmor-parser:
   apparmor-parser-make.patch (1.3 -> 1.4) , apparmor-parser.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/apparmor-parser/apparmor-parser-make.patch
diff -u packages/apparmor-parser/apparmor-parser-make.patch:1.3 packages/apparmor-parser/apparmor-parser-make.patch:1.4
--- packages/apparmor-parser/apparmor-parser-make.patch:1.3	Tue Mar 16 22:46:40 2010
+++ packages/apparmor-parser/apparmor-parser-make.patch	Tue Mar 16 22:53:50 2010
@@ -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
  

================================================================
Index: packages/apparmor-parser/apparmor-parser.spec
diff -u packages/apparmor-parser/apparmor-parser.spec:1.25 packages/apparmor-parser/apparmor-parser.spec:1.26
--- packages/apparmor-parser/apparmor-parser.spec:1.25	Tue Mar 16 22:46:40 2010
+++ packages/apparmor-parser/apparmor-parser.spec	Tue Mar 16 22:53:50 2010
@@ -41,7 +41,7 @@
 %patch0 -p1
 
 %build
-%{__make} -C parser main \
+%{__make} -C parser main manpages \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	CFLAGS="%{rpmcflags} %{rpmcppflags}"
@@ -52,12 +52,15 @@
 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 \
@@ -88,6 +91,7 @@
 #%attr(754,root,root) /etc/rc.d/init.d/aaeventd
 /subdomain
 /var/lib/apparmor
+%{_mandir}/man[578]/*.[578]*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -95,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2010/03/16 21:53:50  arekm
+- install man pages
+
 Revision 1.25  2010/03/16 21:46:40  arekm
 - up to 2.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apparmor-parser/apparmor-parser-make.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apparmor-parser/apparmor-parser.spec?r1=1.25&r2=1.26&f=u