SPECS: jss.spec - now libjss3.so builds

[qboosh]

Author: qboosh                       Date: Thu Nov 16 14:30:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- now libjss3.so builds

---- Files affected:
SPECS:
   jss.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/jss.spec
diff -u SPECS/jss.spec:1.1 SPECS/jss.spec:1.2
--- SPECS/jss.spec:1.1	Thu May 11 00:06:53 2006
+++ SPECS/jss.spec	Thu Nov 16 15:30:39 2006
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-# TODO: fix JNI build
 Summary:	JSS - Network Security Services for Java
 Summary(pl):	JSS - Network Security Services for Java - usługi bezpieczeństwa sieciowego dla Javy
 Name:		jss
@@ -11,6 +10,7 @@
 # Source0-md5:	29689ea36b27584feb22d291404506ea
 URL:		http://www.mozilla.org/projects/security/pki/jss/
 BuildRequires:	jdk
+BuildRequires:	jpackage-utils
 BuildRequires:	nspr-devel >= 2.0
 BuildRequires:	nss-devel
 BuildRequires:	perl-base
@@ -35,6 +35,11 @@
 %setup -q -n %{name}-%{version}-src
 
 sed -i -e 's/-O/-O -source 1.4/' mozilla/security/jss/build_java.pl
+sed -i -e 's,/classic,/server,' mozilla/security/coreconf/jdk.mk
+
+install -d mozilla/dist/public
+ln -sf /usr/include/nspr mozilla/dist/public/nspr20
+ln -sf /usr/include/nss mozilla/dist/public/nss
 
 %build
 %{__make} -C mozilla/security/coreconf \
@@ -44,17 +49,17 @@
 %{__make} -C mozilla/security/jss \
 	BUILD_OPT=1 \
 	CC="%{__cc}" \
-	JAVA_HOME=%{_libdir}/java \
+	JAVA_HOME="%{java_home}" \
 	OPTIMIZER="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javalibdir}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_libdir}}
 
-install mozilla/dist/xpclass.jar $RPM_BUILD_ROOT%{_javalibdir}
-ln -sf xpclass.jar $RPM_BUILD_ROOT%{_javalibdir}/jss.jar
+install mozilla/dist/xpclass.jar $RPM_BUILD_ROOT%{_javadir}
+ln -sf xpclass.jar $RPM_BUILD_ROOT%{_javadir}/jss.jar
 
-# TODO: JNI library
+install mozilla/dist/Linux*/lib/libjss3.so $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -62,7 +67,9 @@
 %files
 %defattr(644,root,root,755)
 %doc mozilla/security/jss/jss.html
-%{_javalibdir}/*.jar
+%attr(755,root,root) %{_libdir}/libjss3.so
+%{_javadir}/jss.jar
+%{_javadir}/xpclass.jar
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -70,5 +77,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2006/11/16 14:30:39  qboosh
+- now libjss3.so builds
+
 Revision 1.1  2006/05/10 22:06:53  qboosh
 - new, doesn't build yet
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jss.spec?r1=1.1&r2=1.2&f=u