[imapsync] Update to 1.518 (with patches to fix outdated license references in imapsync and README)

Nick Bebout nb at fedoraproject.org
Thu Jan 17 18:56:59 UTC 2013


commit c432b877f90542326b466e2bf9a6fea1a44eefbe
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Jan 17 12:56:52 2013 -0600

    Update to 1.518 (with patches to fix outdated license references in imapsync and README)

 .gitignore             |    1 +
 README-license.patch   |   23 +++++++++++++++++++++++
 imapsync-license.patch |   32 ++++++++++++++++++++++++++++++++
 imapsync.spec          |   11 ++++++++++-
 sources                |    2 +-
 5 files changed, 67 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b41e9a0..c496750 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ imapsync-1.340.tgz
 /imapsync-1.504.tgz
 /imapsync-1.508.tgz
 /imapsync-1.516.tgz
+/imapsync-1.518.tgz
diff --git a/README-license.patch b/README-license.patch
new file mode 100644
index 0000000..919bb37
--- /dev/null
+++ b/README-license.patch
@@ -0,0 +1,23 @@
+--- README.old	2013-01-17 12:28:54.584069604 -0600
++++ README	2013-01-17 12:29:41.404193480 -0600
+@@ -195,9 +195,9 @@
+ 
+ LICENSE
+     imapsync is free, open source but not always gratis software cover by
+-    the Do What The Fuck You Want To Public License (WTFPL). See COPYING
++    the No Limit Public License (NLPL). See COPYING
+     file included in the distribution or the web site
+-    http://sam.zoy.org/wtfpl/COPYING
++    http://imapsync.lamiral.info/COPYING
+ 
+ MAILING-LIST
+     The public mailing-list may be the best way to get support.
+@@ -418,7 +418,7 @@
+     Welcome in shell programming !
+ 
+ Hacking
+-    Feel free to hack imapsync as the WTFPL Licence permits it.
++    Feel free to hack imapsync as the NLPL Licence permits it.
+ 
+ Links
+     Entries for imapsync: http://www.imap.org/products/showall.php
diff --git a/imapsync-license.patch b/imapsync-license.patch
new file mode 100644
index 0000000..2b068d9
--- /dev/null
+++ b/imapsync-license.patch
@@ -0,0 +1,32 @@
+--- imapsync.old	2013-01-17 12:28:49.905057221 -0600
++++ imapsync	2013-01-17 12:29:30.421164425 -0600
+@@ -237,9 +237,9 @@
+ =head1 LICENSE
+ 
+ imapsync is free, open source but not always gratis software cover by
+-the Do What The Fuck You Want To Public License (WTFPL).
++the No Limit Public License (NLPL).
+ See COPYING file included in the distribution or the web site
+-http://sam.zoy.org/wtfpl/COPYING
++http://imapsync.lamiral.info/COPYING
+ 
+ =head1 MAILING-LIST
+ 
+@@ -488,7 +488,7 @@
+ 
+ =head1 Hacking
+ 
+-Feel free to hack imapsync as the WTFPL Licence permits it.
++Feel free to hack imapsync as the NLPL Licence permits it.
+ 
+ =head1 Links
+ 
+@@ -3660,7 +3660,7 @@
+ 	return("Homepage: http://imapsync.lamiral.info/\n");
+ 	
+         # used to be
+-	return(join("", "Happy with this free, open and gratis DWTFPL software?\n",
++	return(join("", "Happy with this free, open and gratis NLPL software?\n",
+ 	  "Encourage the author (Gilles LAMIRAL) by giving him a book\n",
+           "or just money via paypal:\n",
+ 	  "http://imapsync.lamiral.info/\n"));
diff --git a/imapsync.spec b/imapsync.spec
index 6bddbf6..6d6d7c7 100644
--- a/imapsync.spec
+++ b/imapsync.spec
@@ -1,12 +1,16 @@
 Name: imapsync
 Summary: Tool to migrate email between IMAP servers
-Version: 1.516
+Version: 1.518
 Release: 1%{?dist}
 License: NLPL
 Group: Applications/Internet
 
 URL: http://fedorahosted.org/imapsync
+
 Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tgz
+Patch0: imapsync-license.patch
+Patch1: README-license.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -31,6 +35,8 @@ optionally be deleted after a successful transfer.
 
 %prep
 %setup -q
+%patch0
+%patch1
 
 cat << \EOF > %{name}-req
 #!/bin/sh
@@ -59,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644, root, root) %{_mandir}/man1/imapsync.1*
 
 %ChangeLog
+* Thu Jan 17 2013 Nick Bebout <nb at fedoraproject.org> - 1.518-1
+- Upgrade to 1.518
+
 * Tue Nov 27 2012 Nick Bebout <nb at fedoraproject.org> - 1.516-1
 - Upgrade to 1.516
 
diff --git a/sources b/sources
index 9fb7e72..1a627d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6aed0660e2d909e1610e1d6d7b2cd093  imapsync-1.516.tgz
+45d0fd93e46fd5962cb1673ce3e5d926  imapsync-1.518.tgz


More information about the scm-commits mailing list