From 3f050a2acb8747a63efdf125dae0c8f6b364507d Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Aug 04 2006 22:56:10 +0000 Subject: - Add licence terms clarification from Debian's patch. --- diff --git a/compface-README.copyright b/compface-README.copyright new file mode 100644 index 0000000..4e2d405 --- /dev/null +++ b/compface-README.copyright @@ -0,0 +1,80 @@ +Extracted from Debian GNU/Linux's package: + +[...] + +Compface - 48x48x1 image compression and decompression +Copyright (c) James Ashton 1990. +Written 89/11/11 + +Feel free to distribute this source at will so long as the above +message and this message are included in full. + +This copyright message dosn't specify whether modified version is allowed, +but the following mail from the author does allow them: + +> From: James Ashton +> Subject: Re: Bug#72019: compface not DFSG +> Date: Wed, 20 Sep 2000 09:48:34 +1100 (EST) +> +> >On Tue, Sep 19, 2000 at 08:58:43AM -0400, Raul Miller wrote: +> >> Package: compface +> >> Version: 1989.11.11-17.1 +> >> Severity: important +> >> +> >> compface's copyright doesn't grant permission to +> >> distribute modified versions +> > +> >The compface copyright says: +> > +> >Feel free to distribute this source at will so long as the above +> >message and this message are included in full. +> > +> > +> >Which could be interpretated as it is allowed to distribute modified +> >versions of it. James Ashton is the original author, would you care to +> >clairify the matter, mr Ashton? +> +> I don't mind modified versions being distributed. Please included the +> original copyright notices as specified and also prominently note, if +> it is a modified version, the nature and author(s) of the +> modifications. +> -- +> James Ashton VK1XJA System Administrator +> http://wwwsyseng.anu.edu.au/~jaa Department of Systems Engineering +> Voice +61 2 6279 8675 Research School of Information Sciences and Engineering +> FAX +61 2 6279 8688 Australian National University +> Email James.Ashton@anu.edu.au Canberra ACT 0200 Australia +> + +Another peoblem with the copyright of this source code is that the +copyright message in the source files and in the readme file is conflicting. +The following mail from the author should clear that up: + +> From: James Ashton +> Subject: Re: libcompface license (again) +> Date: Thu, 22 Feb 2001 09:32:23 +1100 (EST) +> +> >Hi, +> >I'm maintaining the debian pkg of your compface lib, and I've talket to you +> >before about it's license. And now ouer legal people have found another +> >problem. The sourcefiles contains a diffrent copyright notice than the +> >redmefile. They say: +> > +> >> * Permission is given to distribute these sources, as long as the +> >> * copyright messages are not removed, and no monies are exchanged.=20 +> > +> >The problem is the last part "no monies are exchanged". As you probably=20 +> >know we do allow third party companies to produce debian CDs and sell them. +> >So this statement would inmply that we can't have your libcompface in +> debian +> >at all. +> +> I'm happy to remove the phrase no monies are exchanged' from the +> source and allow distribution as per the README file. Do you need more +> from me than just this email? +> -- +> James Ashton VK1XJA System Administrator +> http://wwwsyseng.anu.edu.au/~jaa Department of Systems Engineering +> Voice +61 2 6125 8675 Research School of Information Sciences and Engineering +> FAX +61 2 6125 8660 Australian National University +> Email James.Ashton@anu.edu.au Canberra ACT 0200 Australia diff --git a/compface.spec b/compface.spec index 581fe96..cdfdab4 100644 --- a/compface.spec +++ b/compface.spec @@ -1,6 +1,6 @@ Name: compface Version: 1.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utilities for handling X-Faces Group: Applications/Multimedia @@ -8,6 +8,7 @@ License: MIT URL: http://www.ibiblio.org/pub/Linux/apps/graphics/convert/ Source0: http://ftp.xemacs.org/pub/xemacs/aux/%{name}-%{version}.tar.gz Source1: compface-test.xbm +Source2: compface-README.copyright Patch0: http://ftp.debian.org/debian/pool/main/libc/libcompface/libcompface_1.5.2-3.diff.gz Patch1: compface-1.5.2-stack-smashing.patch Patch2: %{name}-1.5.2-build.patch @@ -41,6 +42,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true +mkdir -p _extdoc && install -p -m 0644 %{SOURCE2} _extdoc/README.copyright %check || : @@ -61,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README xbm2xface.pl +%doc _extdoc/README.copyright %{_bindir}/compface %{_bindir}/uncompface %{_libdir}/libcompface.so.* @@ -76,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 5 2006 Michael Schwendt - 1.5.2-3 +- Add licence terms clarification from Debian's patch. + * Fri Aug 4 2006 Michael Schwendt - 1.5.2-2 - Add patch to prevent sscanf stack smashing through Debian's patch. - Fix two GCC warnings in the same patch.