rpms/pl/devel pl.spec,1.46,1.47

[Mary Ellen Foster (mef)]

Author: mef

Update of /cvs/pkgs/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13356

Modified Files:
	pl.spec 
Log Message:
Put jpl.jar where pl can find it


Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- pl.spec	22 Feb 2008 16:29:08 -0000	1.46
+++ pl.spec	22 Feb 2008 17:08:12 -0000	1.47
@@ -99,11 +99,6 @@
         libdir=$RPM_BUILD_ROOT%{_libdir} \
 	mandir=$RPM_BUILD_ROOT%{_mandir}/man1
 )
-%ifnarch ppc ppc64
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-mv $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/lib/jpl.jar $RPM_BUILD_ROOT%{_javadir}/jpl-%{version}.jar
-ln -s jpl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jpl.jar
-%endif
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/man
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/doc
@@ -125,14 +120,14 @@
 # Exclude the files that are in the jpl sub-package
 %exclude %{_libdir}/pl-%{version}/library/jpl.pl
 %exclude %{_libdir}/pl-%{version}/lib/*/libjpl.so
+%exclude %{_libdir}/pl-%{version}/lib/jpl.jar
 
 %ifnarch ppc64 ppc
 %files jpl
 %doc packages/jpl/docs/*
-%{_javadir}/jpl-%{version}.jar
-%{_javadir}/jpl.jar
 %{_libdir}/pl-%{version}/library/jpl.pl
 %{_libdir}/pl-%{version}/lib/*/libjpl.so
+%{_libdir}/pl-%{version}/lib/jpl.jar
 %endif