[SDL/origin/f13: 2/6] Remove src/joystick/darwin/10.3.9-FIX/IOHIDLib.h

Petr Pisar ppisar at fedoraproject.org
Tue Aug 3 10:59:01 UTC 2010


commit ac90694c39eee86e4057181005cab3cadd67b769
Author: Petr Písař <ppisar at redhat.com>
Date:   Mon Aug 2 13:07:15 2010 +0200

    Remove src/joystick/darwin/10.3.9-FIX/IOHIDLib.h
    
    The file is lincensed under APSL-2.0 and it's not needed on Linux. Because
    APSL-2.0 license is bad (e.g. it will cancel the license if receiver suit
    Apple Inc. for pattent infringement), I decided to remove the file.

 SDL.spec     |   11 ++++++++---
 repackage.sh |    1 +
 sources      |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/SDL.spec b/SDL.spec
index 985b7cf..752f456 100644
--- a/SDL.spec
+++ b/SDL.spec
@@ -1,10 +1,10 @@
 Summary: A cross-platform multimedia library
 Name: SDL
 Version: 1.2.14
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 # To create the repackaged archive use repackage.sh %{version}
-Source: http://www.libsdl.org/release/%{name}-%{version}_repackaged.tar.gz
+Source0: %{name}-%{version}_repackaged.tar.gz
 # The license of the file src/video/fbcon/riva_mio.h is bad, but the contents
 # of the file has been relicensed to MIT in 2008 by Nvidia for the 
 # xf86_video-nv driver, therefore it can be considered ok.
@@ -68,7 +68,7 @@ device. This package provides the static libraries needed for developing
 static SDL applications.
 
 %prep
-%setup -q 
+%setup -q -b0
 %patch0 -p1 -b .byteorder
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .disable_yasm
@@ -132,6 +132,11 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Aug 02 2010 Petr Pisar <ppisar at redhat.com> - 1.2.14-6
+- Make repacked source tar ball relative
+- Remove useless src/joystick/darwin/10.3.9-FIX/IOHIDLib.h because of APSL-2.0
+  license
+
 * Wed Jun 23 2010 Hans de Goede <hdegoede at redhat.com> 1.2.14-5
 - Don't crash when trying to exit because of an xio-error (rh603984, sdl1009)
 
diff --git a/repackage.sh b/repackage.sh
index 44f5352..a0679bf 100755
--- a/repackage.sh
+++ b/repackage.sh
@@ -23,6 +23,7 @@ version=$1
 
 # files to be removed without the main SDL-<version>/ prefix
 declare -a REMOVE
+REMOVE[${#REMOVE[*]}]="src/joystick/darwin/10.3.9-FIX/IOHIDLib.h"
 REMOVE[${#REMOVE[*]}]="src/joystick/os2/joyos2.h"
 REMOVE[${#REMOVE[*]}]="symbian.zip"
 
diff --git a/sources b/sources
index 155ec98..12c3a61 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 e52086d1b508fa0b76c52ee30b55bec4  SDL-1.2.14.tar.gz
-6b7e212eca38ad5e36f279a850cb40b6  SDL-1.2.14_repackaged.tar.gz
+9dd45acd094badaa7f43d00679186f9c  SDL-1.2.14_repackaged.tar.gz


More information about the scm-commits mailing list