[rss2email] in builddir overwrite the r2e script instead of adding a temporary rss2mail-r2e file

Michael Schwendt mschwendt at fedoraproject.org
Wed Jan 12 22:09:04 UTC 2011


commit 45c21b2cf45824cca9e0991b104cd486c128fac2
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Jan 12 23:08:46 2011 +0100

    in builddir overwrite the r2e script instead of adding a temporary rss2mail-r2e file

 rss2email.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rss2email.spec b/rss2email.spec
index 313d0d3..e6e788e 100644
--- a/rss2email.spec
+++ b/rss2email.spec
@@ -1,6 +1,6 @@
 Name:           rss2email
 Version:        2.70
-Release:        1
+Release:        1%{?dist}
 Summary:        Deliver news from RSS feeds to your SMTP server as text or HTML mail
 
 Group:          Applications/Internet
@@ -45,7 +45,7 @@ See the manual page r2e for details on how to set up rss2email.
 %setup -q
 chmod -x CHANGELOG readme* config*
 # prepare the custom "r2e" wrapper script
-cat %{SOURCE3} | sed -e 's!@datadir@!%{_datadir}!' > rss2email-r2e
+cat %{SOURCE3} | sed -e 's!@datadir@!%{_datadir}!' > r2e
 
 %patch0 -p1 -b .config-location
 sed -i -e 's/\r//' CHANGELOG rss2email.py config.py.example
@@ -63,7 +63,7 @@ mkdir -p  \
    $RPM_BUILD_ROOT%{_mandir}/man1/
 
 install -p -m 0755 rss2email.py $RPM_BUILD_ROOT%{_datadir}/%{name}/
-install -p -m 0755 rss2email-r2e $RPM_BUILD_ROOT%{_bindir}/r2e
+install -p -m 0755 r2e $RPM_BUILD_ROOT%{_bindir}/r2e
 install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/r2e.1
 # the copy in docdir may not be present for an --excludedocs install
 install -p -m 0644 config.py.example $RPM_BUILD_ROOT%{_datadir}/%{name}/


More information about the scm-commits mailing list