浏览代码

Added testsaslauthd and made path endings consistent

Michael Schloh von Bennewitz 23 年之前
父节点
当前提交
61a40be8f1
共有 1 个文件被更改,包括 11 次插入6 次删除
  1. 11 6
      sasl/sasl.spec

+ 11 - 6
sasl/sasl.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Cryptography
 License:      BSD
 Version:      2.1.12
-Release:      20030212
+Release:      20030213
 
 #   package options
 %option       with_fsl    no
@@ -113,12 +113,17 @@ AutoReqProv:  no
         --without-des \
         --without-opie
     %{l_make} %{l_mflags}
+    cd saslauthd
+    %{l_make} %{l_mflags} testsaslauthd
 
 %install
     rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
     %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+    %{l_shtool} install -c -m 755 \
+        saslauthd/testsaslauthd  \
+        $RPM_BUILD_ROOT%{l_prefix}/sbin/
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
 %if "%{with_pam}" == "yes"
@@ -129,18 +134,18 @@ AutoReqProv:  no
         %{SOURCE rc.sasl} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 %if "%{with_fsl}" == "yes"
-      %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+      %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
           %{SOURCE fsl.sasl} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
 %endif
     %{l_shtool} mkdir -f -p -m 700 \
-        $RPM_BUILD_ROOT%{l_prefix}/var/sasl/log
+        $RPM_BUILD_ROOT%{l_prefix}/var/sasl/log/
     %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/var/sasl/saslauthd
+        $RPM_BUILD_ROOT%{l_prefix}/var/sasl/saslauthd/
     mv $RPM_BUILD_ROOT%{l_prefix}/lib/sasl2 \
-        $RPM_BUILD_ROOT%{l_prefix}/lib/sasl
+        $RPM_BUILD_ROOT%{l_prefix}/lib/sasl/
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
 %if "%{with_fsl}" == "yes"