From 70373147c3276863b38a01df840bd98bff5c0a29 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:45 +0000 Subject: [PATCH 1/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2a8b2b6..cdc39b6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: rss2email -# $Id$ +# $Id: Makefile,v 1.1 2007/03/26 07:38:07 petersen Exp $ NAME := rss2email SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 8fa13ac28c51a6115095a1d60e03c03743df89f1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:21:11 +0000 Subject: [PATCH 2/5] Initialize branch EL-6 for rss2email --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 49a63c7014461aaf7bdf24757b33dfc72feeb0ab Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Sun, 4 Jul 2010 16:54:12 +0000 Subject: [PATCH 3/5] - update to 2.66, which now is shipped in a tarball --- .cvsignore | 3 +-- rss2email-config.py.template | 13 ------------- rss2email.spec | 26 +++++++++++++------------- sources | 3 +-- 4 files changed, 15 insertions(+), 30 deletions(-) delete mode 100644 rss2email-config.py.template diff --git a/.cvsignore b/.cvsignore index f260e3a..5fe7c04 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -rss2email.py -CHANGELOG +rss2email-2.66.tar.gz diff --git a/rss2email-config.py.template b/rss2email-config.py.template deleted file mode 100644 index 3118aef..0000000 --- a/rss2email-config.py.template +++ /dev/null @@ -1,13 +0,0 @@ -# Find some common used config options below; all can be found all and -# descriptions in the section titled "### Vaguely Customizable Options ###" -# near the top of /usr/share/rss2email/rss2email.py - -DEFAULT_FROM="bozo@dev.null.invalid" -HTML_MAIL=1 -SMTP_SEND=1 -SMTP_SERVER="localhost" -AUTHREQUIRED=0 -SMTP_USER="username" -SMTP_PASS="password" -DATE_HEADER=0 -# PROXY="" diff --git a/rss2email.spec b/rss2email.spec index d4a1bc3..4203c4f 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,19 +1,18 @@ Name: rss2email -Version: 2.65 -Release: 3.1 +Version: 2.66 +Release: 1.1 Summary: Deliver news from RSS feeds to your smtp server as text or html mail Group: Applications/Internet License: GPLv3 -URL: http://rss2email.infogami.com/ -Source0: http://rss2email.infogami.com/rss2email.py -Source1: http://rss2email.infogami.com/CHANGELOG -# Fedora variant of http://lindsey.smith.googlepages.com/r2e +URL: http://www.allthingsrss.com/rss2email/ +Source0: http://www.allthingsrss.com/rss2email/rss2email-2.66.tar.gz +# Fedora variant of http://lindsey.smith.googlepages.com/r2e , which since 2.66 +# is included in the rss2email tarball Source3: rss2email-r2e # man page taken from # http://ftp.debian.org/debian/pool/main/r/rss2email/rss2email_2.60-3.diff.gz Source4: rss2email-r2e.1 -Source5: rss2email-config.py.template Patch0: rss2email-use-configpy-from-homedir.patch BuildArch: noarch @@ -31,12 +30,10 @@ See the man page r2e for details how to set rss2email up. %prep -%setup -q -c -T -install -p -m 0644 %{SOURCE0} rss2email.py -install -p -m 0644 %{SOURCE1} CHANGELOG.html +%setup -q # let rss2email use ${HOME}/.rss2email/config.py %patch0 -b .patch0 -sed -i -e 's/\r//' CHANGELOG.html rss2email.py +sed -i -e 's/\r//' CHANGELOG rss2email.py %build @@ -54,7 +51,7 @@ install -p -m 0755 rss2email.py $RPM_BUILD_ROOT%{_datadir}/%{name}/ install -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/r2e sed -i -e 's;/usr/share;%{_datadir};g' $RPM_BUILD_ROOT%{_bindir}/r2e install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/r2e.1 -install -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/config.py.template +install -p -m 0644 config.py $RPM_BUILD_ROOT%{_datadir}/%{name}/config.py.template %clean @@ -63,12 +60,15 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc CHANGELOG.html +%doc CHANGELOG readme.html %{_bindir}/* %{_datadir}/%{name}/ %{_mandir}/man1/* %changelog +* Sun Jul 04 2010 Thorsten Leemhuis - 2.66-1 +- update to 2.66, which now is shipped in a tarball + * Sun Jul 26 2009 Fedora Release Engineering - 2.65-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 81b0b27..9bfa107 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -eff3f5ed82b3ccaa622f06d595b24dba rss2email.py -b68f79442af6ba24421ebd663cba9f58 CHANGELOG +84a7aa98b52952e37dd239fefb01e9d9 rss2email-2.66.tar.gz From 98c26d5e9d622266dccf96b671b7b3994c98099b Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Sun, 4 Jul 2010 16:55:57 +0000 Subject: [PATCH 4/5] add disttag --- rss2email.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rss2email.spec b/rss2email.spec index 4203c4f..e4954d1 100644 --- a/rss2email.spec +++ b/rss2email.spec @@ -1,6 +1,6 @@ Name: rss2email Version: 2.66 -Release: 1.1 +Release: 1%{?dist} Summary: Deliver news from RSS feeds to your smtp server as text or html mail Group: Applications/Internet From 63d863cadba7306cc1a9b628388ed4cdfb145f72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:41:23 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index cdc39b6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: rss2email -# $Id: Makefile,v 1.1 2007/03/26 07:38:07 petersen Exp $ -NAME := rss2email -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6