SPECS: puretls.spec - use java macros - add -javadoc - builds with...

[glen]

Author: glen                         Date: Mon Apr  9 23:57:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use java macros
- add -javadoc
- builds with java-1.5

---- Files affected:
SPECS:
   puretls.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/puretls.spec
diff -u SPECS/puretls.spec:1.8 SPECS/puretls.spec:1.9
--- SPECS/puretls.spec:1.8	Tue Feb 13 09:06:42 2007
+++ SPECS/puretls.spec	Tue Apr 10 01:57:16 2007
@@ -13,6 +13,8 @@
 BuildRequires:	ant
 BuildRequires:	cryptix
 BuildRequires:	cryptix-asn1 = 0.20011119
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	gnu.getopt
 Requires:	cryptix
 Requires:	cryptix-asn1 = 0.20011119
@@ -34,6 +36,18 @@
 Systems Inc., ale jest dystrybuowany za darmo, ponieważ właściciele
 uznali, że podstawowe bezpieczeństwo sieci jest dobrem publicznym.
 
+%package javadoc
+Summary:	Online manual for %{name}
+Summary(pl.UTF-8):	Dokumentacja online do %{name}
+Group:		Documentation
+Requires:	jpackage-utils
+
+%description javadoc
+Documentation for %{name}.
+
+%description javadoc -l pl.UTF-8
+Dokumentacja do %{name}a.
+
 %prep
 %setup -q -n %{name}-%{version}%{beta}
 find . -type f |
@@ -43,26 +57,20 @@
 	xargs grep -l "/usr/local/bin/perl" | \
 	xargs perl -pi -e "s|/usr/local/bin/perl|/usr/bin/perl|g;"
 
-find . -name "*.jar" -exec rm -f {} \;
-find . -name "*.class" -exec rm -f {} \;
-
 %build
-ant \
-	-Dcryptix.jar=%{_javadir}/cryptix.jar \
-	-Dcryptix-asn1.jar=%{_javadir}/cryptix-asn1.jar \
-	-Dgnugetopt.jar=%{_javadir}/gnu.getopt.jar \
+required_jars="cryptix cryptix-asn1 gnu.getopt"
+export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+
+%ant \
 	-Djdk.version=%{jdkversion} \
 	clean compile
 
-ant -Dcryptix.jar=%{_javadir}/cryptix.jar \
-	-Dcryptix-asn1.jar=%{_javadir}/cryptix-asn1.jar \
-	-Dgnugetopt.jar=%{_javadir}/gnu.getopt.jar \
+%ant \
 	javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_datadir}/%{name}}
 
 cp build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}
 ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
@@ -71,21 +79,34 @@
 cp *.pem $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp test.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr build/doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog COPYRIGHT INSTALL LICENSE README build/doc/*
+%doc ChangeLog COPYRIGHT INSTALL LICENSE README
 %{_javadir}/*.jar
 %{_datadir}/%{name}
 
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{name}-%{version}
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2007/04/09 23:57:16  glen
+- use java macros
+- add -javadoc
+- builds with java-1.5
+
 Revision 1.8  2007/02/13 08:06:42  glen
 - tabs in preamble
 
@@ -100,7 +121,7 @@
 - formatting
 
 Revision 1.4  2004/07/15 12:59:58  pluto
-- use %%{_javadir}.
+- use %{_javadir}.
 
 Revision 1.3  2003/08/18 08:09:30  gotar
 - mass commit: cosmetics (removed trailing white spaces)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/puretls.spec?r1=1.8&r2=1.9&f=u