# HG changeset patch # User Guido Berhoerster # Date 1398847032 -7200 # Node ID 51f7ba1cdf7c00cdf77b7f65f0724d63253bf469 # Parent f17c85a9fb8b3b64c0330537c0e91f3420967880 Back out changeset f17c85a9fb8b: Does not work with Ruby 1.9 diff -r f17c85a9fb8b -r 51f7ba1cdf7c feed2imap-rubygem-compatibility.patch --- a/feed2imap-rubygem-compatibility.patch Mon Apr 28 17:34:11 2014 +0200 +++ b/feed2imap-rubygem-compatibility.patch Wed Apr 30 10:37:12 2014 +0200 @@ -1,19 +1,19 @@ -Index: feed2imap-feed2imap_1.2.2/lib/feed2imap/feed2imap.rb +Index: feed2imap/lib/feed2imap/feed2imap.rb =================================================================== ---- feed2imap-feed2imap_1.2.2.orig/lib/feed2imap/feed2imap.rb -+++ feed2imap-feed2imap_1.2.2/lib/feed2imap/feed2imap.rb +--- feed2imap.orig/lib/feed2imap/feed2imap.rb ++++ feed2imap/lib/feed2imap/feed2imap.rb @@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite - F2I_VERSION = '1.2.1' + F2I_VERSION = '1.0' F2I_WARNFETCHTIME = 10 +require 'rubygems' require 'feed2imap/config' require 'feed2imap/cache' require 'feed2imap/httpfetcher' -Index: feed2imap-feed2imap_1.2.2/lib/feed2imap/itemtomail.rb +Index: feed2imap/lib/feed2imap/itemtomail.rb =================================================================== ---- feed2imap-feed2imap_1.2.2.orig/lib/feed2imap/itemtomail.rb -+++ feed2imap-feed2imap_1.2.2/lib/feed2imap/itemtomail.rb +--- feed2imap.orig/lib/feed2imap/itemtomail.rb ++++ feed2imap/lib/feed2imap/itemtomail.rb @@ -19,6 +19,7 @@ along with this program; if not, write t Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA =end @@ -22,10 +22,10 @@ require 'rexml/document' require 'time' require 'rmail' -Index: feed2imap-feed2imap_1.2.2/lib/feed2imap/rexml_patch.rb +Index: feed2imap/lib/feed2imap/rexml_patch.rb =================================================================== ---- feed2imap-feed2imap_1.2.2.orig/lib/feed2imap/rexml_patch.rb -+++ feed2imap-feed2imap_1.2.2/lib/feed2imap/rexml_patch.rb +--- feed2imap.orig/lib/feed2imap/rexml_patch.rb ++++ feed2imap/lib/feed2imap/rexml_patch.rb @@ -17,6 +17,7 @@ along with this program; if not, write t Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA =end diff -r f17c85a9fb8b -r 51f7ba1cdf7c feed2imap.spec --- a/feed2imap.spec Mon Apr 28 17:34:11 2014 +0200 +++ b/feed2imap.spec Wed Apr 30 10:37:12 2014 +0200 @@ -1,14 +1,16 @@ %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%global snapshot 20130109 Name: feed2imap -Version: 1.2.2 -Release: 1%{?dist} +Version: 1.0 +Release: 1.%{snapshot}git%{?dist} Summary: RSS/Atom Feed Aggregator Using an IMAP Server or Maildir for Storage Group: Applications/Internet License: GPLv2+ URL: http://home.gna.org/feed2imap/ -Source0: https://github.com/feed2imap/feed2imap/archive/%{name}_%{version}.tar.gz +# git clone git://github.com/ln/feed2imap.git; tar -cjf feed2imap-$(date +%%Y%%m%%d).tar.bz2 --exclude-vcs feed2imap +Source0: %{name}-%{snapshot}.tar.bz2 # make feed2imap compatible with rubygem versions of ruby-feedparser and rmail Patch0: feed2imap-rubygem-compatibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,7 +30,7 @@ agent. %prep -%setup -q -n %{name}-%{name}_%{version} +%setup -q -n %{name} %patch0 -p1 %build @@ -59,8 +61,5 @@ %{_mandir}/man1/feed2imap-opmlimport.1* %changelog -* Mon Apr 28 2014 Guido Berhoerster - 1.2.2-1 -- Update to version 1.2.2 - * Wed Jan 09 2013 Guido Berhoerster - 1.0-1.20130109 - Initial packaging diff -r f17c85a9fb8b -r 51f7ba1cdf7c sources --- a/sources Mon Apr 28 17:34:11 2014 +0200 +++ b/sources Wed Apr 30 10:37:12 2014 +0200 @@ -1,1 +1,1 @@ -798594ddf6dc2b51a36d48178b5e98e7 feed2imap_1.2.2.tar.gz +20a310a3792e0e309cf0c1443928cba3 feed2imap-20130109.tar.bz2