packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[pawelz]

Author: pawelz                       Date: Wed Apr 14 22:45:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- %_javasrcdir := %{_usrsrc}/java
- 1.555

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.250 -> 1.251) , rpm.macros (1.554 -> 1.555) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.250 packages/rpm-build-macros/rpm-build-macros.spec:1.251
--- packages/rpm-build-macros/rpm-build-macros.spec:1.250	Wed Apr 14 17:32:00 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec	Thu Apr 15 00:44:59 2010
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		rpm_macros_rev	1.554
+%define		rpm_macros_rev	1.555
 %define		find_lang_rev	1.32
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
@@ -90,6 +90,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.251  2010/04/14 22:44:59  pawelz
+- %_javasrcdir := %{_usrsrc}/java
+- 1.555
+
 Revision 1.250  2010/04/14 15:32:00  glen
 - 1.554: add %cacti_import_template
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.554 packages/rpm-build-macros/rpm.macros:1.555
--- packages/rpm-build-macros/rpm.macros:1.554	Wed Apr 14 17:32:00 2010
+++ packages/rpm-build-macros/rpm.macros	Thu Apr 15 00:44:59 2010
@@ -1207,6 +1207,8 @@
 
 %java_home		%{expand:%%global java_home %([ -f %{_javadir}-utils/java-functions ] || { echo ERROR; exit 0; }; unset JAVA_HOME; . %{_javadir}-utils/java-functions; set_jvm; echo ${JAVA_HOME:-ERROR})}%java_home
 
+%_javasrcdir	%{_usrsrc}/java
+
 %ant			JAVA_HOME=%{java_home} CLASSPATH=$CLASSPATH ant
 %jar			%{java_home}/bin/jar
 %java			%{expand:%%global java %([ -f %{_javadir}-utils/java-functions ] || { echo ERROR; exit 0; }; unset JAVACMD; . %{_javadir}-utils/java-functions; set_javacmd; echo $JAVACMD)}%java
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.250&r2=1.251&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.554&r2=1.555&f=u