[unoconv] update FSF address in COPYING
David Tardon
dtardon at fedoraproject.org
Mon Nov 5 14:19:30 UTC 2012
commit 373013bf8c37d408763c5f3ac7f848a448a9750c
Author: David Tardon <dtardon at redhat.com>
Date: Mon Nov 5 15:18:51 2012 +0100
update FSF address in COPYING
0001-update-FSF-address.patch | 147 +++++++++++++++++++++++++++++++++++++++++
unoconv.spec | 2 +
2 files changed, 149 insertions(+), 0 deletions(-)
---
diff --git a/0001-update-FSF-address.patch b/0001-update-FSF-address.patch
new file mode 100644
index 0000000..925cf4f
--- /dev/null
+++ b/0001-update-FSF-address.patch
@@ -0,0 +1,147 @@
+From 4be0b90f1935120e4f9196b6fc126248079cbf11 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Mon, 5 Nov 2012 15:08:24 +0100
+Subject: [PATCH] update FSF address
+
+---
+ COPYING | 41 ++++++++++++++++++++---------------------
+ unoconv | 3 ++-
+ 2 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/COPYING b/COPYING
+index d60c31a..d159169 100644
+--- a/COPYING
++++ b/COPYING
+@@ -1,12 +1,12 @@
+- GNU GENERAL PUBLIC LICENSE
+- Version 2, June 1991
++ GNU GENERAL PUBLIC LICENSE
++ Version 2, June 1991
+
+- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+- Preamble
++ Preamble
+
+ The licenses for most software are designed to take away your
+ freedom to share and change it. By contrast, the GNU General Public
+@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
+ General Public License applies to most of the Free Software
+ Foundation's software and to any other program whose authors commit to
+ using it. (Some other Free Software Foundation software is covered by
+-the GNU Library General Public License instead.) You can apply it to
++the GNU Lesser General Public License instead.) You can apply it to
+ your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+ modification follow.
+-
+- GNU GENERAL PUBLIC LICENSE
++
++ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+-
++
+ These requirements apply to the modified work as a whole. If
+ identifiable sections of that work are not derived from the Program,
+ and can be reasonably considered independent and separate works in
+@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
+ access to copy the source code from the same place counts as
+ distribution of the source code, even though third parties are not
+ compelled to copy the source along with the object code.
+-
++
+ 4. You may not copy, modify, sublicense, or distribute the Program
+ except as expressly provided under this License. Any attempt
+ otherwise to copy, modify, sublicense or distribute the Program is
+@@ -225,7 +225,7 @@ impose that choice.
+
+ This section is intended to make thoroughly clear what is believed to
+ be a consequence of the rest of this License.
+-
++
+ 8. If the distribution and/or use of the Program is restricted in
+ certain countries either by patents or by copyrighted interfaces, the
+ original copyright holder who places the Program under this License
+@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
+ of preserving the free status of all derivatives of our free software and
+ of promoting the sharing and reuse of software generally.
+
+- NO WARRANTY
++ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+
+- END OF TERMS AND CONDITIONS
+-
+- How to Apply These Terms to Your New Programs
++ END OF TERMS AND CONDITIONS
++
++ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+ possible use to the public, the best way to achieve this is to make it
+@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+- You should have received a copy of the GNU General Public License
+- along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+-
++ You should have received a copy of the GNU General Public License along
++ with this program; if not, write to the Free Software Foundation, Inc.,
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Also add information on how to contact you by electronic and paper mail.
+
+ If the program is interactive, make it output a short notice like this
+ when it starts in an interactive mode:
+
+- Gnomovision version 69, Copyright (C) year name of author
++ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
+ This General Public License does not permit incorporating your program into
+ proprietary programs. If your program is a subroutine library, you may
+ consider it more useful to permit linking proprietary applications with the
+-library. If this is what you want to do, use the GNU Library General
++library. If this is what you want to do, use the GNU Lesser General
+ Public License instead of this License.
+diff --git a/unoconv b/unoconv
+index 30e6706..e4a1ac8 100755
+--- a/unoconv
++++ b/unoconv
+@@ -11,7 +11,8 @@
+ ###
+ ### You should have received a copy of the GNU General Public License
+ ### along with this program; if not, write to the Free Software
+-### Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++### Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
++### MA 02110-1301 USA.
+ ### Copyright 2007-2010 Dag Wieers <dag at wieers.com>
+
+ from distutils.version import LooseVersion
+--
+1.7.11.7
+
diff --git a/unoconv.spec b/unoconv.spec
index d9196d6..4b36144 100644
--- a/unoconv.spec
+++ b/unoconv.spec
@@ -6,6 +6,7 @@ License: GPLv2
Group: System Environment/Base
URL: http://dag.wieers.com/home-made/unoconv/
Source: http://dag.wieers.com/home-made/%{name}/%{name}-%{version}.tar.gz
+Patch0: 0001-update-FSF-address.patch
BuildArch: noarch
Requires: libreoffice-core
@@ -22,6 +23,7 @@ RTF, Docbook (.xml), and more.
%prep
%setup -q
+%patch0 -p1
%build
More information about the scm-commits
mailing list