Jelajahi Sumber

fix building

Michael van Elst 22 tahun lalu
induk
melakukan
108a0ad8e6
1 mengubah file dengan 7 tambahan dan 4 penghapusan
  1. 7 4
      imapd/imapd.spec

+ 7 - 4
imapd/imapd.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      BSD
 Version:      2.1.14
-Release:      20030717
+Release:      20030718
 
 #   package options
 %option       with_fsl         yes
@@ -98,7 +98,9 @@ Provides:     IMAP
         timsieved/actions.c
 
     #   adjust default config to install environment for use in mkimap install helper script
-    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+    %{l_shtool} install -c -m 644 \
+        -e "s;\(@l_prefix@\);$RPM_BUILD_ROOT\1;g" \
+        %{l_value -s -a} \
         %{SOURCE imapd.conf} \
         imapd.conf-mkimap
     %{l_shtool} subst \
@@ -166,7 +168,7 @@ Provides:     IMAP
       tag="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}"
       perl="${RPM_BUILD_DIR}/perl-$tag"
       %{l_make} PERL="$perl"
-    ) || exit 1
+    ) || exit $?
     %{l_prefix}/bin/perl-openpkg install -d perl/sieve/managesieve
     %{l_prefix}/bin/perl-openpkg install -d perl/sieve/acap
     %{l_prefix}/bin/perl-openpkg epilog
@@ -209,7 +211,8 @@ Provides:     IMAP
       for i in deliver master quota reconstruct; do
           mv bin/$i        bin/cyr$i
           mv man/man8/$i.8 man/man8/cyr$i.8
-      done )
+      done
+    ) || exit $?
 
     #   install from tools
     %{l_shtool} install -c -m 755 \