SPECS: bind.spec - create _doc dir for packaging docs

glen glen at pld-linux.org
Tue Oct 21 23:06:17 CEST 2008


Author: glen                         Date: Tue Oct 21 21:06:17 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- create _doc dir for packaging docs

---- Files affected:
SPECS:
   bind.spec (1.283 -> 1.284) 

---- Diffs:

================================================================
Index: SPECS/bind.spec
diff -u SPECS/bind.spec:1.283 SPECS/bind.spec:1.284
--- SPECS/bind.spec:1.283	Tue Oct 21 22:22:05 2008
+++ SPECS/bind.spec	Tue Oct 21 23:06:11 2008
@@ -394,8 +394,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f doc/rfc/rfc*
-
 bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 mv $RPM_BUILD_ROOT%{_mandir}/ja/man8/nslookup.8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nslookup.1
 %{__perl} -pi -e 's/NSLOOKUP 8/NSLOOKUP 1/' $RPM_BUILD_ROOT%{_mandir}/ja/man1/nslookup.1
@@ -427,8 +425,10 @@
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*.*
 
 # we don't want Makefiles in documentation...
-# FIXME: breaks re-entrant install
-rm -f doc/misc/Makefile*
+rm -rf _doc
+cp -a doc _doc
+rm -f _doc/rfc/rfc*
+rm -f _doc/misc/Makefile*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -470,7 +470,8 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README EXAMPLE-CONFIG-* FAQ doc/misc/* doc/arm/*.html doc/rfc/index %{?with_ldap:doc/*.sdb-ldap} %{?with_hip:bind-hip/COPYRIGHT-HIP-RR}
+%doc README EXAMPLE-CONFIG-* FAQ %{?with_hip:bind-hip/COPYRIGHT-HIP-RR}
+%doc _doc/misc/* _doc/arm/*.html _doc/rfc/index %{?with_ldap:_doc/*.sdb-ldap}
 
 %attr(754,root,root) /etc/rc.d/init.d/named
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/named
@@ -593,6 +594,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.284  2008/10/21 21:06:11  glen
+- create _doc dir for packaging docs
+
 Revision 1.283  2008/10/21 20:22:05  qboosh
 - let rpm generate deps for shared libs
 - restored rm for Makefiles from doc (better non-reentrant install than junk in packages)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bind.spec?r1=1.283&r2=1.284&f=u



More information about the pld-cvs-commit mailing list