Author: pawelz Date: Mon Apr 6 05:17:56 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- renamed from cryptix-asn1.spec
- dropped BRs: log4j, junit, gnu-getopt
- added jdk bconds
- added javadoc bcond
- include java rpm macros
---- Files affected:
SPECS:
java-cryptix-asn1.spec (1.13 -> 1.14)
---- Diffs:
================================================================
Index: SPECS/java-cryptix-asn1.spec
diff -u SPECS/java-cryptix-asn1.spec:1.13 SPECS/java-cryptix-asn1.spec:1.14
--- SPECS/java-cryptix-asn1.spec:1.13 Fri Apr 3 14:53:04 2009
+++ SPECS/java-cryptix-asn1.spec Mon Apr 6 07:17:51 2009
@@ -1,35 +1,53 @@
# $Revision$, $Date$
-# TODO:
-# does it realy uses system gnu-getopt and log4j?
+%bcond_without javadoc # build api docs
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun # build with gcj
+%else
+%bcond_with java_sun # build with java-sun
+%endif
+#
+%include /usr/lib/rpm/macros.java
%define snap 20011119
+%define srcname cryptix-asn1
Summary: Cryptix ASN1 implementation
Summary(pl.UTF-8): Implementacja Cryptix ASN1
-Name: cryptix-asn1
+Name: java-cryptix-asn1
Version: 0.%{snap}
Release: 0.1
License: BSD-like
-Group: Development/Languages/Java
+Group: Libraries/Java
# http://www.rtfm.com/cgi-bin/distrib.cgi?Cryptix-asn1-20011119.tar.gz
Source0: Cryptix-asn1-%{snap}.tar.gz
# Source0-md5: ac4080eee24b1cf0a476cee4fe501149
-Source1: %{name}.build.xml
+Source1: %{srcname}.build.xml
URL: http://cryptix-asn1.sourceforge.net/
-Patch0: %{name}-java-1.5.patch
+Patch0: %{srcname}-java-1.5.patch
BuildRequires: ant >= 1.5
-BuildRequires: cryptix
-BuildRequires: java-gnu-getopt
-BuildRequires: java-junit
-BuildRequires: java-log4j
-#BuildRequires: jikes
+BuildRequires: java-cryptix
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
BuildRequires: jpackage-utils
BuildRequires: rpmbuild(macros) >= 1.300
-Requires: cryptix
+Requires: java-cryptix
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _javalibdir %{_datadir}/java
+%package javadoc
+Summary: Online manual for %{srcname}
+Summary(pl.UTF-8): Dokumentacja online do %{srcname}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+Documentation for %{srcname}.
+
+%description javadoc -l pl.UTF-8
+Dokumentacja do %{srcname}.
+
+%description javadoc -l fr.UTF-8
+Javadoc pour %{srcname}.
%description
Java crypto package containing ASN1 implementation.
@@ -44,21 +62,38 @@
find . -name "*.jar" -exec rm -f {} \;
%build
-%ant clean jar javadoc
+CLASSPATH=$(build-classpath cryptix)
+%ant clean jar %{?with_javadoc:javadoc}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javalibdir}
-cp build/lib/*.jar $RPM_BUILD_ROOT%{_javalibdir}
+install -d $RPM_BUILD_ROOT%{_javadir}
+cp build/lib/*.jar $RPM_BUILD_ROOT%{_javadir}
+
+# javadoc
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a build/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost
symlink
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
+%post javadoc
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
+
%files
%defattr(644,root,root,755)
-%doc build/api
-%{_javalibdir}/*.jar
+%{_javadir}/*.jar
+
+%if %{with javadoc}
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -66,6 +101,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2009/04/06 05:17:51 pawelz
+- renamed from cryptix-asn1.spec
+- dropped BRs: log4j, junit, gnu-getopt
+- added jdk bconds
+- added javadoc bcond
+- include java rpm macros
+
Revision 1.13 2009/04/03 12:53:04 pawelz
- new names for BRs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-cryptix-asn1.spec?r1=1.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
