فهرست منبع

make sure it finds the libsavi.so

Ralf S. Engelschall 22 سال پیش
والد
کامیت
02f41a5929
2فایلهای تغییر یافته به همراه21 افزوده شده و 12 حذف شده
  1. 4 0
      sophie/sophie.sh
  2. 17 12
      sophie/sophie.spec

+ 4 - 0
sophie/sophie.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+LD_LIBRARY_PATH="@l_prefix@/lib/sav:${LD_LIBRARY_PATH:-/usr/lib}"
+export LD_LIBRARY_PATH
+exec @l_prefix@/libexec/sophie/sophie ${1+"$@"}

+ 17 - 12
sophie/sophie.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        System
 License:      GPL
 Version:      3.03
-Release:      20030805
+Release:      20030811
 
 #   package options
 %option       with_fsl yes
@@ -44,12 +44,13 @@ Source1:      fsl.sophie
 Source2:      rc.sophie
 Source3:      sophie.cfg
 Source4:      sophie.savi
+Source5:      sophie.sh
 Patch0:       sophie.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, make, gcc, sav
+BuildPreReq:  OpenPKG, openpkg >= 20030103, sav, make, gcc
 PreReq:       OpenPKG, openpkg >= 20030103, sav
 %if "%{with_fsl}" == "yes"
 BuildPreReq:  fsl >= 1.0.6
@@ -60,18 +61,16 @@ AutoReqProv:  no
 
 %description
     Sophie is a daemon which uses the libsavi library from Sophos
-    Anti-Virus.
-
-    On startup, Sophie initializes SAVI (Sophos Anti-Virus Interface),
-    loads virus patterns into memory, opens local UNIX domain socket,
-    and waits for someone to connect and instructs it which path to
-    scan. Since it is loaded in RAM, scanning is very fast. Of course,
-    speed of scanning also depends on SAVI settings and size of the
-    file.
+    Anti-Virus. On startup, Sophie initializes SAVI (Sophos Anti-Virus
+    Interface), loads virus patterns into memory, opens local UNIX
+    domain socket, and waits for someone to connect and instructs it
+    which path to scan. Since it is loaded in RAM, scanning is very
+    fast. Of course, speed of scanning also depends on SAVI settings and
+    size of the file.
 
 %prep
     %setup -q
-    %patch0 -p1
+    %patch -p1
     %{l_shtool} subst %{l_value -s -a} \
         sophie.c \
         sophie_init.c
@@ -81,6 +80,8 @@ AutoReqProv:  no
         sophie.h
 
 %build
+    LD_LIBRARY_PATH="%{l_prefix}/lib/sav:${LD_LIBRARY_PATH-/usr/lib}"
+    export LD_LIBRARY_PATH
     CC="%{l_cc}" \
     CXX="%{l_cxx}" \
     CFLAGS="%{l_cflags -O}" \
@@ -102,10 +103,14 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
         $RPM_BUILD_ROOT%{l_prefix}/etc/sophie \
         $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/sophie \
         $RPM_BUILD_ROOT%{l_prefix}/var/sophie
     %{l_shtool} install -c -s -m 755 \
         sophie \
-        $RPM_BUILD_ROOT%{l_prefix}/bin/
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/sophie/
+    %{l_shtool} install -c -m 755 %{l_value -s -a} \
+        %{SOURCE sophie.sh} \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/sophie
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
         %{SOURCE fsl.sophie} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/