OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 19-Sep-2003 09:38:17 Branch: HEAD Handle: 2003091908381502 Modified files: openpkg-src/sendmail sendmail.spec openpkg-web news.txt Log: remove broken and unportable newline-containing sed(1) construct with unpretty but portable and working construct Summary: Revision Changes Path 1.98 +7 -2 openpkg-src/sendmail/sendmail.spec 1.6636 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/sendmail/sendmail.spec ============================================================================ $ cvs diff -u -r1.97 -r1.98 sendmail.spec --- openpkg-src/sendmail/sendmail.spec 18 Sep 2003 16:45:49 -0000 1.97 +++ openpkg-src/sendmail/sendmail.spec 19 Sep 2003 07:38:17 -0000 1.98 @@ -33,7 +33,7 @@ Group: Mail License: BSD Version: 8.12.10 -Release: 20030918 +Release: 20030919 # package options %option with_fsl yes @@ -120,12 +120,17 @@ # override platform-specific definitions ( cd sendmail-%{version} + ( echo "#ifdef _PATH_SENDMAIL" + echo "#undef _PATH_SENDMAIL" + echo "#endif" + ) >sed.include %{l_shtool} subst \ -e 's;\(define *SMRSH_CMDDIR *\).*;\1 "%{l_prefix}/var/sendmail/sm.bin";g' \ -e 's;\(define *_PATH_SENDMAIL *\).*;\1 "%{l_prefix}/sbin/sendmail";g' \ - -e 's;\(include *<paths.h>.*\);\1\n#ifdef _PATH_SENDMAIL\n#undef _PATH_SENDMAIL\n#endif;g' \ + -e '/# *include *<paths.h>.*/r sed.include' \ -e '/undef *_PATH_SENDMAILPID/d' \ include/sendmail/pathnames.h include/sm/conf.h + rm -f sed.include ) || exit $? %build @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.6635 -r1.6636 news.txt --- openpkg-web/news.txt 18 Sep 2003 19:42:07 -0000 1.6635 +++ openpkg-web/news.txt 19 Sep 2003 07:38:15 -0000 1.6636 @@ -1,3 +1,4 @@ +19-Sep-2003: Upgraded package: P<sendmail-8.12.10-20030919> 18-Sep-2003: Upgraded package: P<kde-libs-3.1.4-20030918> 18-Sep-2003: Upgraded package: P<qpopper-4.0.5-20030918> 18-Sep-2003: Upgraded package: P<kde-arts-1.1.4-20030918> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]