diff --git a/.gitignore b/.gitignore index 301db6e..15ad059 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ email2trac.tar.gz +/email2trac-2.6.2.tar.gz diff --git a/email2trac-0.13-installperms.patch b/email2trac-0.13-installperms.patch deleted file mode 100644 index afe5dd8..0000000 --- a/email2trac-0.13-installperms.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up ../email2trac-0.13/Makefile.in.jk ../email2trac-0.13/Makefile.in ---- email2trac-0.13/Makefile.in.jk 2008-05-19 11:30:59.000000000 -0400 -+++ email2trac-0.13/Makefile.in 2008-05-19 11:40:26.000000000 -0400 -@@ -33,17 +33,17 @@ run_email2trac: $(WRAPPER_SRC) Makefile - - install: all install-conf - $(INSTALL) -d $(DESTDIR)$(EXEC_PREFIX) -- $(INSTALL) -m 4111 -o root run_email2trac $(DESTDIR)$(EXEC_PREFIX) -+ $(INSTALL) -m 755 run_email2trac $(DESTDIR)$(EXEC_PREFIX) - for script in $(PYTHON_FILES) ; \ - do \ - name=`basename $$script '.py'` ;\ -- $(INSTALL) -m 755 -o root $$script $(DESTDIR)$(EXEC_PREFIX)/$$name ;\ -+ $(INSTALL) -m 755 $$script $(DESTDIR)$(EXEC_PREFIX)/$$name ;\ - done - - install-conf: - if [ ! -f $(DESTDIR)/$(CONFIG)/email2trac.conf ] ; \ - then \ -- $(INSTALL) -c -m 644 -o root email2trac.conf $(DESTDIR)/$(CONFIG)/email2trac.conf ;\ -+ $(INSTALL) -c -m 644 email2trac.conf $(DESTDIR)/$(CONFIG)/email2trac.conf ;\ - fi - - clean: diff --git a/email2trac-0.13-spamlevel.patch b/email2trac-0.13-spamlevel.patch deleted file mode 100644 index 0eb4b20..0000000 --- a/email2trac-0.13-spamlevel.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up email2trac-0.13/email2trac.py.in.spam email2trac-0.13/email2trac.py.in ---- email2trac-0.13/email2trac.py.in.spam 2008-05-23 14:31:40.000000000 -0400 -+++ email2trac-0.13/email2trac.py.in 2008-05-23 14:32:25.000000000 -0400 -@@ -247,6 +247,13 @@ class TicketEmailParser(object): - if number >= self.SPAM_LEVEL: - spam = True - -+ if message.has_key('X-Spam-Level'): -+ spam_l = string.split(message['X-Spam-Level']) -+ number = spam_l[0].count('*') -+ -+ if number >= self.SPAM_LEVEL: -+ spam = True -+ - # treat virus mails as spam - # - elif message.has_key('X-Virus-found'): diff --git a/email2trac-2.6.2-installperms.patch b/email2trac-2.6.2-installperms.patch new file mode 100644 index 0000000..4db3a60 --- /dev/null +++ b/email2trac-2.6.2-installperms.patch @@ -0,0 +1,22 @@ +diff -up email2trac-2.6.2/Makefile.in.orig email2trac-2.6.2/Makefile.in +--- email2trac-2.6.2/Makefile.in.orig 2010-03-24 11:09:47.000000000 +0100 ++++ email2trac-2.6.2/Makefile.in 2013-03-11 20:42:43.055175533 +0100 +@@ -37,15 +37,15 @@ install: all install-conf + for script in $(PYTHON_FILES) ; \ + do \ + name=`basename $$script '.py'` ;\ +- $(INSTALL) -m 755 -o $(INSTALL_USER) $$script $(DESTDIR)$(EXEC_PREFIX)/$$name ;\ ++ $(INSTALL) -m 755 $$script $(DESTDIR)$(EXEC_PREFIX)/$$name ;\ + done + +- $(INSTALL) -m 4111 -o $(INSTALL_USER) run_email2trac $(DESTDIR)$(EXEC_PREFIX) ++ $(INSTALL) -m 755 run_email2trac $(DESTDIR)$(EXEC_PREFIX) + + install-conf: + if [ ! -f $(DESTDIR)/$(CONFIG)/email2trac.conf ] ; \ + then \ +- $(INSTALL) -c -m 644 -o $(INSTALL_USER) email2trac.conf $(DESTDIR)/$(CONFIG)/email2trac.conf ;\ ++ $(INSTALL) -c -m 644 email2trac.conf $(DESTDIR)/$(CONFIG)/email2trac.conf ;\ + fi + + clean: diff --git a/email2trac.spec b/email2trac.spec index 86cfd2d..5b9da9f 100644 --- a/email2trac.spec +++ b/email2trac.spec @@ -1,40 +1,38 @@ # This spec file was derived from the upstream .spec file written by # Jon Topper Name: email2trac -Version: 0.80 -Release: 5%{?dist} +Version: 2.6.2 +Release: 1%{?dist} Summary: Utilities for converting emails to trac tickets - Group: Applications/Internet -License: GPLv2+ -URL: https://subtrac.sara.nl/oss/email2trac -# Note, upstream doesn't name the tarball after the release, lame. -Source0: ftp://ftp.sara.nl/pub/outgoing/email2trac.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - +License: ASL 2.0 +URL: https://oss.trac.surfsara.nl/email2trac +Source0: ftp://ftp.sara.nl/pub/outgoing/email2trac-%{version}.tar.gz BuildRequires: python Requires: trac -Patch0: email2trac-0.13-installperms.patch -Patch1: email2trac-0.13-spamlevel.patch +Patch0: email2trac-2.6.2-installperms.patch %description -This is a release of the SARA package email2trac that contains utilities that -we use to convert emails to trac tickets. The initial setup was made by -Daniel Lundin from Edgewall Software. SARA has extend the initial setup, -with the following extensions: - - * HTML messages - * Attachments - * Use commandline options - * Use config file to change the behaviour of the email2trac.py program - * Some unicode support for special characters in the headers of an email - message +This is a release of the SARA package email2trac that contains +utilities that we use to convert emails to trac tickets. The initial +setup was made by Daniel Lundin from Edgewall Software. SARA has +extend the initial setup, with the following extensions: + + * HTML message conversion + * Attachments + * Tickets can be updated via email + * Use command-line options + * Configuration file to control the behavior. + * Unicode support + * SPAM detection + * Workflow support + * FullBlogPlugin support + * DiscussionPlugin support %prep %setup -q %patch0 -p1 -%patch1 -p1 %build @@ -43,17 +41,11 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - - -%clean -rm -rf $RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} %files -%defattr(-,root,root,-) -%doc README AUTHORS COPYING INSTALL ChangeLog +%doc AUTHORS ChangeLog LICENSE NOTICE README %{_bindir}/delete_spam %{_bindir}/email2trac %{_bindir}/run_email2trac @@ -61,6 +53,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 11 2013 Thomas Moschny - 2.6.2-1 +- Updated to 2.6.2. + - License changed to ASL 2.0. + - Updated URL. + - Update one patch, drop obsolete patch. +- Modernize spec file. + * Wed Feb 13 2013 Fedora Release Engineering - 0.80-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -93,4 +92,3 @@ rm -rf $RPM_BUILD_ROOT * Mon May 19 2008 Jesse Keating - 0.13-1 - First submission to Fedora - diff --git a/sources b/sources index 2906033..75dca53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a6e707d958e577e49ec351bb781ff78 email2trac.tar.gz +34905bf0257d08c6ab7da158e968eb2a email2trac-2.6.2.tar.gz