[SDL/f12/master] Remove src/joystick/darwin/10.3.9-FIX/IOHIDLib.h

Petr Pisar ppisar at fedoraproject.org
Tue Aug 3 12:46:22 UTC 2010


commit 2c36d644b2c92a66e090dcb03c09df8c99115e36
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     |    7 +++++--
 repackage.sh |    1 +
 sources      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/SDL.spec b/SDL.spec
index 330299c..aa22de3 100644
--- a/SDL.spec
+++ b/SDL.spec
@@ -4,7 +4,7 @@ Version: 1.2.13
 Release: 12%{?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.
@@ -81,7 +81,7 @@ device. This package provides the static libraries needed for developing
 static SDL applications.
 
 %prep
-%setup -q 
+%setup -q -b0
 %patch0 -p1 -b .byteorder
 %patch17 -p1 -b .libdir
 %patch21 -p1 -b .multilib
@@ -153,6 +153,9 @@ rm -rf %{buildroot}
 %changelog
 * Tue Aug  3 2010 Petr Pisar <ppisar at redhat.com> 1.2.13-12
 - Don't crash when trying to exit because of an xio-error (rh603984, sdl1009)
+- Make repacked source tar ball relative
+- Remove useless src/joystick/darwin/10.3.9-FIX/IOHIDLib.h because of APSL-2.0
+  license
 
 * Wed Mar 24 2010 Thomas Woerner <twoerner at redhat.com> 1.2.13-11
 - added repackage.sh script to remove joyos2,h and symbian.zip because of
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 df0844d..79d1722 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 c6660feea2a6834de10bc71b2f8e4d88  SDL-1.2.13.tar.gz
-d391b5179bc993da0e33637781b3ade8  SDL-1.2.13_repackaged.tar.gz
+0c3e9757fdeda45e4d4dd1dcc35e0fb9  SDL-1.2.13_repackaged.tar.gz


More information about the scm-commits mailing list