SPECS: cryptix.spec - use java macros. builds with java-1.5

glen glen at pld-linux.org
Tue Apr 10 01:50:41 CEST 2007


Author: glen                         Date: Mon Apr  9 23:50:41 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use java macros. builds with java-1.5

---- Files affected:
SPECS:
   cryptix.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/cryptix.spec
diff -u SPECS/cryptix.spec:1.12 SPECS/cryptix.spec:1.13
--- SPECS/cryptix.spec:1.12	Mon Feb 12 22:23:51 2007
+++ SPECS/cryptix.spec	Tue Apr 10 01:50:36 2007
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# WON'T BUILD WITH J1.5 - uses some reserved keywords as variable names,
-# needs compiling in 1.4 compatible mode (-source 1.4)
 Summary:	Java crypto package
 Summary(pl.UTF-8):	Pakiet kryptograficzny Javy
 Name:		cryptix
@@ -13,6 +11,8 @@
 # Source0-md5:	7a3545ede3fff5c89eba601fea03791a
 Source1:	%{name}.build.xml
 URL:		http://www.cryptix.org/
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 Patch0:		%{name}-java-1.5.patch
 BuildRequires:	ant >= 1.5
 BuildRequires:	unzip
@@ -36,10 +36,10 @@
 %setup -q -c
 %patch0 -p1
 cp %{SOURCE1} build.xml
-find . -name "*.jar" -exec rm -f {} \;
+find -name '*.jar' | xargs rm -v
 
 %build
-ant jar javadoc
+%ant jar javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2007/04/09 23:50:36  glen
+- use java macros. builds with java-1.5
+
 Revision 1.12  2007/02/12 21:23:51  glen
 - tabs in preamble
 
@@ -80,7 +83,7 @@
 - BR(unzip) added.
 
 Revision 1.6  2004/07/15 13:06:37  pluto
-- use %%{_javadir}.
+- use %{_javadir}.
 
 Revision 1.5  2003/08/26 23:19:17  gotar
 - no // in paths, sort, white space cleaning
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cryptix.spec?r1=1.12&r2=1.13&f=u



More information about the pld-cvs-commit mailing list