packages (ASTERISK_1_6_1): asterisk/asterisk.spec - merged too much

[glen]

Author: glen                         Date: Thu Sep 16 14:54:07 2010 GMT
Module: packages                      Tag: ASTERISK_1_6_1
---- Log message:
- merged too much

---- Files affected:
packages/asterisk:
   asterisk.spec (1.161.2.1 -> 1.161.2.2) 

---- Diffs:

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.161.2.1 packages/asterisk/asterisk.spec:1.161.2.2
--- packages/asterisk/asterisk.spec:1.161.2.1	Thu Sep 16 16:47:59 2010
+++ packages/asterisk/asterisk.spec	Thu Sep 16 16:54:02 2010
@@ -753,9 +753,6 @@
 find doc/api/html -name '*.map' -size 0 -delete
 %endif
 
-rm $RPM_BUILD_ROOT%{_datadir}/asterisk/documentation/appdocsxml.dtd
-rm $RPM_BUILD_ROOT%{_datadir}/asterisk/documentation/core-en_US.xml
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1281,6 +1278,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161.2.2  2010/09/16 14:54:02  glen
+- merged too much
+
 Revision 1.161.2.1  2010/09/16 14:47:59  glen
 - up to 1.6.1.20, merges from HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.161.2.1&r2=1.161.2.2&f=u