rpms/SDL/F-13 repackage.sh, NONE, 1.1 SDL.spec, 1.70, 1.71 sources, 1.17, 1.18

[Thomas Woerner]

Author: twoerner

Update of /cvs/pkgs/rpms/SDL/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29829

Modified Files:
	SDL.spec sources 
Added Files:
	repackage.sh 
Log Message:
- added repackage.sh script to remove joyos2,h and symbian.zip because of
  licensing problems
- added comment about riva_mmio.h license




--- NEW FILE repackage.sh ---
#!/bin/bash
#
# Copyright (C) 2010 Red Hat, Inc.
# Authors:
# Thomas Woerner <twoerner at redhat.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# 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, see <http://www.gnu.org/licenses/>.
#

version=$1
[ -z "$version" ] && { echo "Usage: $0 <version>"; exit 1; }

# files to be removed without the main SDL-<version>/ prefix
declare -a REMOVE
REMOVE[${#REMOVE[*]}]="src/joystick/os2/joyos2.h"
REMOVE[${#REMOVE[*]}]="symbian.zip"

# no changes below this line should be needed

orig="SDL-${version}"
orig_tgz="${orig}.tar.gz"
repackaged="${orig}_repackaged"
repackaged_tar="${repackaged}.tar"
repackaged_tgz="${repackaged_tar}.gz"

# pre checks
[ ! -f "${orig_tgz}" ] && { echo "ERROR: ${orig_tgz} does not exist"; exit 1; }
[ -f "${repackaged_tgz}" ] && { echo "ERROR: ${repackaged_tgz} already exist"; exit 1; }

# repackage
failure=0
gzip -dc "${orig_tgz}" > "${repackaged_tar}"
for file in "${REMOVE[@]}"; do
    tar -f "${repackaged_tar}" --delete "${orig}/${file}" >> repackage.log
    [ $? != 0 ] && { echo "ERROR: Could not remove file ${orig}/${file} from archive."; failure=1; } || echo "Removed ${orig}/${file} from archive."
done
[ $failure != 0 ] && { echo "See repackage.log for details."; exit 1; }
gzip -9 -n "${repackaged_tar}"

# post checks
RET=0
for file in "${REMOVE[@]}"; do
    found=$(tar -ztvf "${repackaged_tgz}" | grep "${file}")
    [ -n "$found" ] && { echo "ERROR: file ${file} is still in the repackaged archive."; RET=1; }
done

[ $RET == 0 ] && echo "Sucessfully repackaged ${orig}: ${repackaged_tgz}"

exit $RET


Index: SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/F-13/SDL.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- SDL.spec	16 Feb 2010 22:20:27 -0000	1.70
+++ SDL.spec	24 Mar 2010 10:04:07 -0000	1.71
@@ -1,8 +1,13 @@
 Summary: A cross-platform multimedia library
 Name: SDL
 Version: 1.2.14
-Release: 3%{?dist}
-Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
+Release: 4%{?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
+# 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.
 Source1: SDL_config.h
 Patch0: SDL-1.2.14-byteorder.patch
 Patch1: SDL-1.2.12-multilib.patch
@@ -124,6 +129,11 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.a
 
 %changelog
+* Wed Mar 24 2010 Thomas Woerner <twoerner at redhat.com> 1.2.14-4
+- added repackage.sh script to remove joyos2,h and symbian.zip because of
+  licensing problems
+- added comment about riva_mmio.h license
+
 * Tue Feb 16 2010 Josh Boyer <jwboyer at gmail.com> 1.2.14-3
 - disable ps3 video support that was added in 2.14.  It fails to
   build on ppc/ppc64


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/F-13/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	27 Oct 2009 13:11:24 -0000	1.17
+++ sources	24 Mar 2010 10:04:07 -0000	1.18
@@ -1 +1,2 @@
 e52086d1b508fa0b76c52ee30b55bec4  SDL-1.2.14.tar.gz
+6b7e212eca38ad5e36f279a850cb40b6  SDL-1.2.14_repackaged.tar.gz