From c8a0c2525ce4225aa391dcac3b080f5e37c191d3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Pawe=C5=82=20Sikora?= <pluto@pld-linux.org>
Date: Thu, 15 Jul 2004 14:35:03 +0000
Subject: [PATCH] - config.sub refreshed. - TODO added. - %%{_javadir}.

Changed files:
    java-commons-daemon.spec -> 1.5
---
 java-commons-daemon.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index df38cdd..22990bf 100644
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -1,3 +1,7 @@
+#
+# TODO:
+#		- update to 1.0.
+#
 Summary:	Jakarta Commons Daemon - controlling of Java daemons
 Summary(pl):	Jakarta Commons Daemon - kontrolowanie demonów w Javie
 Name:		jakarta-commons-daemon
@@ -18,8 +22,6 @@ Requires:	jakarta-commons-collections >= 2.0
 Requires:	jakarta-commons-logging >= 1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javalibdir	/usr/share/java
-
 %description
 The Daemon Component contains a set of Java and native code,
 including a set of Java interfaces applications must implement and
@@ -52,22 +54,23 @@ Dokumentacja do Jakarta Commons Daemon.
 touch LICENSE
 mkdir srcdir
 cat > build.properties << EOF
-junit.home = %{_javalibdir}
+junit.home = %{_javadir}
 junit.jar = \${junit.home}
 EOF
 ant dist
 
 # native part
 cd src/native/unix
+cp -f /usr/share/automake/config.sub support
 %configure \
 	--with-java=/usr/lib/java
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javalibdir},%{_bindir}}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_bindir}}
 
-install dist/*.jar $RPM_BUILD_ROOT%{_javalibdir}
+install dist/*.jar $RPM_BUILD_ROOT%{_javadir}
 
 install dist/jsvc $RPM_BUILD_ROOT%{_bindir}
 
@@ -78,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc dist/LICENSE
 %attr(755,root,root) %{_bindir}/jsvc
-%{_javalibdir}/*.jar
+%{_javadir}/*.jar
 
 %files doc
 %defattr(644,root,root,755)
-- 
2.43.0