Quellcode durchsuchen

workaround subst problem (rpmtool uses internally %-char for separator)

Ralf S. Engelschall vor 24 Jahren
Ursprung
Commit
99f33cad1d
1 geänderte Dateien mit 6 neuen und 6 gelöschten Zeilen
  1. 6 6
      exim/exim.spec

+ 6 - 6
exim/exim.spec

@@ -105,12 +105,12 @@ Provides:     MTA
 %install
 %install
     rm -rf $RPM_BUILD_ROOT
     rm -rf $RPM_BUILD_ROOT
     %{l_rpmtool} subst -s \
     %{l_rpmtool} subst -s \
-        "s;^\\(BIN_DIRECTORY=\\).*;\\1$RPM_BUILD_ROOT%{l_prefix}/bin;" \
-        "s;^\\(CONFIGURE_FILE=\\).*;\\1$RPM_BUILD_ROOT%{l_prefix}/etc/exim/exim.conf;" \
-        "s;^\\(SPOOL_DIRECTORY=\\).*;\\1$RPM_BUILD_ROOT%{l_prefix}/var/exim/spool;" \
-        "s;^\\(INFO_DIRECTORY=\\).*;\\1$RPM_BUILD_ROOT%{l_prefix}/info;" \
-        "s;^\\(LOG_FILE_PATH=\\).*;\\1$RPM_BUILD_ROOT%{l_prefix}/var/exim/log/\\%s.log;" \
-        "s;^\\(PID_FILE_PATH=\\).*;\\1$RPM_BUILD_ROOT%{l_prefix}/var/exim/run/\\%s.pid;" \
+        "s;^\\(BIN_DIRECTORY=*\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
+        "s;^\\(CONFIGURE_FILE=\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
+        "s;^\\(SPOOL_DIRECTORY=\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
+        "s;^\\(INFO_DIRECTORY=\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
+        "s;^\\(LOG_FILE_PATH=\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
+        "s;^\\(PID_FILE_PATH=\\).*\\(%{l_prefix}/.*\\)$;\\1$RPM_BUILD_ROOT\\2;" \
         -- Local/Makefile
         -- Local/Makefile
     %{l_shtool} mkdir -f -p -m 755 \
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \