[gpm] - Removing PDF docs with unclear licensing from the source archive - Fixing the license tag

Jaromír Cápík jcapik at fedoraproject.org
Wed Aug 7 17:39:03 UTC 2013


commit f344d45e9d93231e73d6735230fd4bf51ccc3431
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Wed Aug 7 19:38:48 2013 +0200

    - Removing PDF docs with unclear licensing from the source archive
    - Fixing the license tag

 .gitignore |    1 +
 gpm.spec   |   20 +++++++++++++++++---
 sources    |    2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f198c28..3f0733e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gpm-1.20.6.tar.lzma
 /gpm-1.20.7.tar.lzma
+/gpm-1.20.7.tar.xz
diff --git a/gpm.spec b/gpm.spec
index a4cb80b..399dd40 100644
--- a/gpm.spec
+++ b/gpm.spec
@@ -1,12 +1,22 @@
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.7
-Release: 2%{?dist}
-License: GPLv2+
+Release: 3%{?dist}
+License: GPLv2 and GPLv2+ with exceptions and GPLv3+ and Verbatim and Copyright only
 Group: System Environment/Daemons
 URL: http://www.nico.schottelius.org/software/gpm/
 #URL2 : http://freecode.com/projects/gpm
-Source: http://www.nico.schottelius.org/software/gpm/archives/%{name}-%{version}.tar.lzma
+
+# The upstream source contains PDF docs with unclear licensing,
+# and that's why we need to remove them and recreate the tarball
+#
+# 1.] mkdir docs-removal && cd docs-removal
+# 2.] wget http://www.nico.schottelius.org/software/gpm/archives/%{name}-%{version}.tar.lzma
+# 3.] tar xf %{name}-%{version}.tar.lzma
+# 3.] rm -rf %{name}-%{version}/doc/specs
+# 4.] tar cJf %{name}-%{version}.tar.xz %{name}-%{version}
+
+Source: %{name}-%{version}.tar.xz
 Source1: gpm.service
 Patch1: gpm-1.20.6-multilib.patch
 Patch2: gpm-1.20.1-lib-silent.patch
@@ -167,6 +177,10 @@ fi
 %{_libdir}/libgpm.a
 
 %changelog
+* Wed Aug 07 2013 Jaromir Capik <jcapik at redhat.com> - 1.20.7-3
+- Removing PDF docs with unclear licensing from the source archive
+- Fixing the license tag
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 5475e44..5ed7c3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa8a6fe09826896625ca557ac5e42ed7  gpm-1.20.7.tar.lzma
+859c3fc083593d68f0d13af25daa5a19  gpm-1.20.7.tar.xz


More information about the scm-commits mailing list