OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   07-May-2004 20:42:32
  Branch: HEAD                             Handle: 2004050719423200

  Modified files:
    openpkg-src/ripe-dbase  ripe-dbase.spec

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

  Summary:
    Revision    Changes     Path
    1.35        +8  -2      openpkg-src/ripe-dbase/ripe-dbase.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ripe-dbase/ripe-dbase.spec
  ============================================================================
  $ cvs diff -u -r1.34 -r1.35 ripe-dbase.spec
  --- openpkg-src/ripe-dbase/ripe-dbase.spec    2 Apr 2004 12:46:26 -0000       1.34
  +++ openpkg-src/ripe-dbase/ripe-dbase.spec    7 May 2004 18:42:32 -0000       1.35
  @@ -34,7 +34,7 @@
   Group:        Database
   License:      RIPE NCC
   Version:      3.2.0
  -Release:      20040402
  +Release:      20040507
   
   #   package options
   %option       with_extobjs  no
  @@ -61,6 +61,7 @@
   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 @@
           --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 @@
           -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} \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to