rpms/cryptix-asn1/devel cryptix-asn1.build.script, 1.1, 1.2 cryptix-asn1.spec, 1.9, 1.10

[Deepak Bhole (dbhole)]

Author: dbhole

Update of /cvs/pkgs/rpms/cryptix-asn1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25233

Modified Files:
	cryptix-asn1.build.script cryptix-asn1.spec 
Log Message:

- Fix bz# 440855: BR java-devel >= 1.6 to bypass sinjdoc issues




Index: cryptix-asn1.build.script
===================================================================
RCS file: /cvs/pkgs/rpms/cryptix-asn1/devel/cryptix-asn1.build.script,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cryptix-asn1.build.script	9 Sep 2004 03:59:20 -0000	1.1
+++ cryptix-asn1.build.script	7 Apr 2008 20:08:16 -0000	1.2
@@ -15,6 +15,8 @@
   <property name="optimize" value="on"/>
   <property name="deprecation" value="off"/>
   <property name="extjars" value="/usr/share/java/cryptix.jar"/>
+  <property name="source.version" value="1.4"/>
+  <property name="target.version" value="1.4"/>
 
   <!-- Targets -->
 
@@ -34,7 +36,8 @@
   <!-- Build classes -->
   <target name="classes" depends="prepare">
     <javac srcdir="${src}" destdir="${build.classes}" classpath="${extjars}" 
-		   debug="${debug}" optimize="${optimize}" deprecation="${deprecation}"/>
+		   debug="${debug}" optimize="${optimize}" deprecation="${deprecation}"
+		   source="${source.version}" target="${target.version}"/>
     <copy todir="${build.classes}">
       <fileset dir="${src}">
         <include name="**/*.properties"/>
@@ -58,6 +61,7 @@
             author="true"
             version="true"
             packagenames="${packagenames}"
+            source="${source.version}"
     />
   </target>
 


Index: cryptix-asn1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptix-asn1/devel/cryptix-asn1.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cryptix-asn1.spec	19 Feb 2008 17:17:56 -0000	1.9
+++ cryptix-asn1.spec	7 Apr 2008 20:08:16 -0000	1.10
@@ -41,7 +41,7 @@
 #FIXME: We will have to tackle this obscene version number soon.
 #Perhaps this package will just die before then.
 Version:	20011119
-Release:	8jpp.2
+Release:	8jpp.3
 Epoch:		0
 Summary:	Cryptix ASN1 implementation
 License:	BSD style
@@ -51,6 +51,7 @@
 Source1:	%{name}.build.script
 Requires:	cryptix
 BuildRequires:	ant, cryptix, jpackage-utils > 1.5
+BuildRequires:  java >= 1.6.0
 %if ! %{gcj_support}
 BuildArch:	noarch
 %endif
@@ -127,6 +128,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Mon Apr 07 2008 Deepak Bhole <dbhole at redhat.com> 20011119-8jpp.3
+- Fix bz# 440855: BR java-devel >= 1.6 to bypass sinjdoc issues
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:20011119-8jpp.2
 - Autorebuild for GCC 4.3