SPECS: rpm.spec - merged macros.java and find-java-requires script...

[qboosh]

Author: qboosh                       Date: Tue May 22 20:05:15 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged macros.java and find-java-requires script from AC-branch

---- Files affected:
SPECS:
   rpm.spec (1.806 -> 1.807) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.806 SPECS/rpm.spec:1.807
--- SPECS/rpm.spec:1.806	Tue May 22 21:48:00 2007
+++ SPECS/rpm.spec	Tue May 22 22:05:09 2007
@@ -55,6 +55,8 @@
 Source12:	perl.prov
 Source13:	%{name}-user_group.sh
 Source14:	%{name}.sysconfig
+Source15:	%{name}-macros.java
+Source16:	%{name}-java-requires
 Source30:	builder
 Source31:	adapter.awk
 Source32:	pldnotify.awk
@@ -786,6 +788,7 @@
 install macros.python	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.python
 install macros.php	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.php
 install macros.mono	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono
+install %{SOURCE15}	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.java
 
 install %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
@@ -793,6 +796,7 @@
 install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc
 install %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/check-files
 install %{SOURCE13} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
+install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/find-java-requires
 install scripts/find-php*	$RPM_BUILD_ROOT%{_rpmlibdir}
 install scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_rpmlibdir}
 install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm
@@ -1159,6 +1163,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.807  2007/05/22 20:05:09  qboosh
+- merged macros.java and find-java-requires script from AC-branch
+
 Revision 1.806  2007/05/22 19:48:00  qboosh
 - rpm2cpio is a script now, rpm2cpio.sh vanished
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.806&r2=1.807&f=u