Browse Source

upgrade to 20020203 snapshot and use shtool subst

Ralf S. Engelschall 24 years ago
parent
commit
e021379a1a
1 changed files with 18 additions and 18 deletions
  1. 18 18
      inn/inn.spec

+ 18 - 18
inn/inn.spec

@@ -25,7 +25,7 @@
 
 %define       V_build    stable
 %define       V_release  2.3.2
-%define       V_stable   20011211
+%define       V_stable   20020203
 
 #   package information
 Name:         inn
@@ -41,7 +41,7 @@ Version:      %{V_release}
 %else
 Version:      %{V_release}.%{V_stable}
 %endif
-Release:      20011212
+Release:      20020203
 
 #   list of sources
 Source0:      ftp://ftp.openpkg.org/DST/inn/fakesyslog.tar.gz
@@ -52,8 +52,8 @@ Source3:      rc.inn
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20011227, make, perl, db, openssl, bison, flex
-PreReq:       OpenPKG, openpkg >= 20011227, perl, MTA
+BuildPreReq:  OpenPKG, openpkg >= 20020203, make, perl, db, openssl, bison, flex
+PreReq:       OpenPKG, openpkg >= 20020203, perl, MTA
 AutoReq:      no
 AutoReqProv:  no
 
@@ -92,12 +92,12 @@ AutoReqProv:  no
 %endif
 
     #   adjust some too strange INN paths
-    %{l_rpmtool} subst \
-        "s;^\\(PATHBIN.*=\\).*;\\1 \$(PATHNEWS)/libexec/inn;" \
-        -- Makefile.global.in
-    %{l_rpmtool} subst \
-        "s;^\\(pathbin:.*\\)@prefix@.*;\\1@prefix@/libexec/inn;" \
-        -- samples/inn.conf.in
+    %{l_shtool} subst \
+        -e "s;^\\(PATHBIN.*=\\).*;\\1 \$(PATHNEWS)/libexec/inn;" \
+        Makefile.global.in
+    %{l_shtool} subst \
+        -e "s;^\\(pathbin:.*\\)@prefix@.*;\\1@prefix@/libexec/inn;" \
+        samples/inn.conf.in
 
     #   configure the source tree
     CC="%{l_cc}" \
@@ -151,14 +151,14 @@ AutoReqProv:  no
     fi
 
     #   adjust INN installation procedure
-    %{l_rpmtool} subst \
-        "s;^\\(prefix.*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix};" \
-        "s;^\\(PATH.*=[    ]*\\)\\(%{l_prefix}\\);\\1 $RPM_BUILD_ROOT\\2;" \
-        "s;^\\(NEWSUSER.*=\\).*;\\1 $thisuser;" \
-        "s;^\\(NEWSGROUP.*=\\).*;\\1 $thisgroup;" \
-        "s;^\\(OWNER.*=\\).*;\\1;" \
-        "s;^\\(ROWNER.*=\\).*;\\1;" \
-        -- Makefile.global
+    %{l_shtool} subst \
+        -e "s;^\\(prefix.*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix};" \
+        -e "s;^\\(PATH.*=[    ]*\\)\\(%{l_prefix}\\);\\1 $RPM_BUILD_ROOT\\2;" \
+        -e "s;^\\(NEWSUSER.*=\\).*;\\1 $thisuser;" \
+        -e "s;^\\(NEWSGROUP.*=\\).*;\\1 $thisgroup;" \
+        -e "s;^\\(OWNER.*=\\).*;\\1;" \
+        -e "s;^\\(ROWNER.*=\\).*;\\1;" \
+        Makefile.global
 
     #   perform installation procedure
     %{l_make} %{l_mflags} install