- use %%{_javadir}.

[packages/cryptix.git] / cryptix.spec

diff --git a/cryptix.spec b/cryptix.spec
index 63926414b72d47d665f51066b80c61e963703e12..1503c2a180acf776ab8c18b5fe5ea03bd25f8c7c 100644 (file)
--- a/cryptix.spec
+++ b/cryptix.spec
@@ -1,5 +1,3 @@
-%define        snapshot        20001002
-
 Summary:       Java crypto package
 Summary(pl):   Pakiet kryptograficzny Javy
 Name:          cryptix
@@ -7,6 +5,7 @@ Version:        3.2.0
 Release:       1
 License:       BSD-like
 Group:         Development/Languages/Java
+%define        snapshot        20001002
 Source0:       http://www.cryptix.org/dist/%{name}32-%{snapshot}-r%{version}.zip
 # Source0-md5: 7a3545ede3fff5c89eba601fea03791a
 Source1:       %{name}.build.xml
@@ -16,8 +15,6 @@ Requires:     jre >= 1.1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _javalibdir     %{_datadir}/java
-
 %description
 Cryptix 3 is a cleanroom implementation of Sun's Java Cryptography
 Extensions (JCE) version 1.1. In addition to that it contains the
@@ -36,14 +33,13 @@ cp %{SOURCE1} build.xml
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
-ant jar
-ant javadoc
+ant jar javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javalibdir}
-cp build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javalibdir}
-ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javalibdir}/%{name}-%{version}.jar
+install -d $RPM_BUILD_ROOT%{_javadir}
+cp build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}
+ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,4 +47,4 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc LICENCE.TXT README.TXT build/api
-%{_javalibdir}/*.jar
+%{_javadir}/*.jar