Browse Source

add conditional dependency to java to regenerate class, attribute, and syntax definitions, and correct whois_filt config file mode

Ralf S. Engelschall 21 years ago
parent
commit
c14d71f16f
1 changed files with 8 additions and 2 deletions
  1. 8 2
      ripe-dbase/ripe-dbase.spec

+ 8 - 2
ripe-dbase/ripe-dbase.spec

@@ -34,7 +34,7 @@ Class:        EVAL
 Group:        Database
 License:      RIPE NCC
 Version:      3.2.0
-Release:      20040402
+Release:      20040507
 
 #   package options
 %option       with_extobjs  no
@@ -61,6 +61,7 @@ PreReq:       gnupg, glib, glib::with_threads = yes, mysql3
 BuildPreReq:  libxml, libxslt, imap, zlib, openssl
 PreReq:       libxml, libxslt, imap, zlib, openssl
 %if "%{with_extobjs}" == "yes"
+BuildPreReq:  JDK
 PreReq:       ripe-asused, perl-net
 %endif
 AutoReq:      no
@@ -125,6 +126,11 @@ AutoReqProv:  no
         --with-cclientinc=%{l_prefix}/include/imap \
         --with-cclientlib=%{l_prefix}/lib \
         --with-gpgcmd=%{l_prefix}/bin/gpg
+%if "%{with_extobjs}" == "yes"
+    ( cd defs
+        %{l_make} %{l_mflags} JAVAC="%{l_prefix}/bin/javac -classpath xalan/xerces.jar:."
+    ) || exit $?
+%endif
     %{l_make} %{l_mflags}
 
 %install
@@ -155,7 +161,7 @@ AutoReqProv:  no
         -e "s;@l_hostname@;$l_hostname;g" \
         %{SOURCE whois_filt.pl} \
         $RPM_BUILD_ROOT%{l_prefix}/bin/whois_filt
-    %{l_shtool} install -c -m 755 %{l_value -s -a} \
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
         %{SOURCE whois_filt.config} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/ripe-dbase/
     %{l_shtool} install -c -m 755 %{l_value -s -a} \