Hello community,
here is the log from the commit of package slrn for openSUSE:Factory checked in
at 2017-03-02 19:42:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/slrn (Old)
and /work/SRC/openSUSE:Factory/.slrn.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slrn"
Thu Mar 2 19:42:56 2017 rev:24 rq:461302 version:1.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/slrn/slrn.changes 2015-01-30
15:08:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.slrn.new/slrn.changes 2017-03-02
19:42:57.439906217 +0100
@@ -1,0 +2,9 @@
+Tue Feb 28 18:57:57 UTC 2017 - sfal...@opensuse.org
+
+- Added:
+ + slrn-correct-path-to-sendmail.patch: The ed stanza in %setup
+ is causing a buildfailure in openSUSE:Factory, and I don't
+ understand ed/regexp well enough to fix it that way. Patching the
+ file directly seems to work fine.
+
+-------------------------------------------------------------------
New:
----
slrn-correct-path-to-sendmail.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ slrn.spec ++++++
--- /var/tmp/diff_new_pack.ZY5ELz/_old 2017-03-02 19:42:58.175802090 +0100
+++ /var/tmp/diff_new_pack.ZY5ELz/_new 2017-03-02 19:42:58.179801524 +0100
@@ -1,7 +1,7 @@
#
# spec file for package slrn
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,8 @@
Patch0: slrn-do-not-strip-binaries.patch
# PATCH-FIX-UPSTREAM slrn-fix-libgnutls-extra-dependency.patch
g...@opensuse.org -- Prevents unnecessary linking against libgnutls-extra
Patch1: slrn-fix-libgnutls-extra-dependency.patch
+# PATCH-FIX-OPENSUSE slrn-correct-path-to-sendmail.patch sfal...@opensuse.org
-- Replaces ed stanza in %%setup, it's failing, and I don't grok ed/regexp very
well.
+Patch2: slrn-correct-path-to-sendmail.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: ed
@@ -57,11 +59,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
-
-# correct path to sendmail
-ed -s src/slrnfeat.hin 2>/dev/null <<'EOF'
-,s/\/usr\/lib\/sendmail/\/usr\/sbin\/sendmail/
-EOF
+%patch2 -p1
# replace __DATE__ and __TIME__ with date/time of the last specfile changelog
# entry
++++++ slrn-correct-path-to-sendmail.patch ++++++
Index: slrn-1.0.2/src/slrnfeat.hin
===================================================================
--- slrn-1.0.2.orig/src/slrnfeat.hin
+++ slrn-1.0.2/src/slrnfeat.hin
@@ -179,7 +179,7 @@
# define SLRN_SIGNATURE_FILE ".signature"
/* Changing these here has no effect when using ./configure */
# ifndef SLRN_SENDMAIL_COMMAND
-# define SLRN_SENDMAIL_COMMAND "/usr/lib/sendmail -oi -t -oem -odb"
+# define SLRN_SENDMAIL_COMMAND "/usr/sbin/sendmail -oi -t -oem -odb"
# endif
# endif /* unix */
# endif /* os2 */
