[Lsb-messages] /var/www/bzr/lsb/devel/appbat r980: Patch celestia to build with libpng15, re-enable build

[Stew Benedict]

------------------------------------------------------------
revno: 980
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: appbat
timestamp: Wed 2013-02-13 10:22:34 -0500
message:
  Patch celestia to build with libpng15, re-enable build
  Cleanup "installed but not packaged" files from lcms (libbat)
added:
  patches/celestia-1.6.0.libpng15.patch
modified:
  desktop/desktop.xml
  entities/package
  extras/md5sums
  rpm/check.sh
  rpm/lsb-build-libbat.spec.in
  rpm/lsb-celestia.spec.in
  rpm/pkgchk.sh
-------------- next part --------------
=== modified file 'desktop/desktop.xml'
--- a/desktop/desktop.xml	2013-02-06 16:42:17 +0000
+++ b/desktop/desktop.xml	2013-02-13 15:22:34 +0000
@@ -5,7 +5,7 @@
      list a new app here only if it's approved to add to the program 
 -->
 &desktop-xpaint;
-<!-- does not support png15, except svn - &desktop-celestia; -->
+&desktop-celestia;
 &desktop-raptor;
 &desktop-leafpad;
 &desktop-pidgin;

=== modified file 'entities/package'
--- a/entities/package	2013-02-06 16:42:17 +0000
+++ b/entities/package	2013-02-13 15:22:34 +0000
@@ -45,6 +45,7 @@
 
 <!ENTITY celestia-package "celestia-1.6.0.tar.gz">
 <!ENTITY celestia-lsb-patch "celestia-1.6.0.patch">
+<!ENTITY celestia-png15-patch "celestia-1.6.0.libpng15.patch">
 
 <!-- this section is not part of the certification program yet -->
 <!ENTITY opensp-package "OpenSP-1.5.2.tar.gz">

=== modified file 'extras/md5sums'
--- a/extras/md5sums	2013-02-06 16:42:17 +0000
+++ b/extras/md5sums	2013-02-13 15:22:34 +0000
@@ -61,6 +61,7 @@
 e567fa9005f9e8feb9e62a58390ac4c8  python-test-bug-2952.patch
 b2d3459d0fcdfce285ceef647540ee6d  lynx2.8.7.patch
 967ae9afe8b881d6ad6c5b404e749964  celestia-1.6.0.patch
+74fa99763b1d46aea29b4361346a33cc  celestia-1.6.0.libpng15.patch
 d45d991da10d72e339fcec9d0a552d16  raptor-1.4.21.patch
 9f6162590ef6b9c8b543bc9c55d438fe  pidgin-2.6.3.patch
 254a72fc67505e3aa52884c729cd7b97  leafpad-0.8.18.1.tar.gz

=== added file 'patches/celestia-1.6.0.libpng15.patch'
--- a/patches/celestia-1.6.0.libpng15.patch	1970-01-01 00:00:00 +0000
+++ b/patches/celestia-1.6.0.libpng15.patch	2013-02-13 15:22:34 +0000
@@ -0,0 +1,21 @@
+--- src/celengine/image.cpp.libpng	2011-09-13 11:34:09.000000000 +0200
++++ src/celengine/image.cpp	2011-09-13 11:34:49.000000000 +0200
+@@ -737,7 +737,7 @@
+ 
+     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+     {
+-        png_set_gray_1_2_4_to_8(png_ptr);
++	png_set_expand_gray_1_2_4_to_8(png_ptr);
+     }
+ 
+     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+--- src/celestia/imagecapture.cpp.libpng	2011-09-13 11:34:57.000000000 +0200
++++ src/celestia/imagecapture.cpp	2011-09-13 11:35:10.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include "../celestia/Celestia.app.skel/Contents/Frameworks/Headers/png.h"
+ #else
+ #include "png.h"
++#include <zlib.h>
+ #endif
+ 
+ // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng

=== modified file 'rpm/check.sh'
--- a/rpm/check.sh	2013-02-08 02:27:43 +0000
+++ b/rpm/check.sh	2013-02-13 15:22:34 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 BUILD_ARCH=`rpm --rcfile /usr/lib/rpm/rpmrc:rpmrc --eval=%{_target_cpu}`
-for spec in `ls *.spec | grep -v celestia`; do
+for spec in `ls *.spec`; do
   name=`basename "$spec" .spec`
   # since libbat is being built seperately, skip it
   if [ "$name" != "lsb-build-libbat" ];then

=== modified file 'rpm/lsb-build-libbat.spec.in'
--- a/rpm/lsb-build-libbat.spec.in	2013-02-12 15:16:14 +0000
+++ b/rpm/lsb-build-libbat.spec.in	2013-02-13 15:22:34 +0000
@@ -529,6 +529,13 @@
 
 make
 make DESTDIR=%{buildroot} install
+
+# drop the man pages and binaries we don't need
+for b in icc2ps icclink icctrans jpegicc tiffdiff tifficc wtpt; do
+  rm -f %{buildroot}%{bindir}/$b
+  rm -f %{buildroot}%{sharedir}/man/man1/$b*
+done
+
 cd ..
 
 # ----------------------------------------------------

=== modified file 'rpm/lsb-celestia.spec.in'
--- a/rpm/lsb-celestia.spec.in	2013-02-12 15:16:14 +0000
+++ b/rpm/lsb-celestia.spec.in	2013-02-13 15:22:34 +0000
@@ -1,7 +1,7 @@
 Summary: A real-time visual space simulation
 Name: lsb-celestia
 Version: 1.6.0
-Release: 6.lsb5
+Release: 7.lsb5
 Vendor: Linux Foundation
 Packager: Appbat Team <lsb-appbat at linux-foundation.org>
 License: GPL
@@ -16,6 +16,7 @@
 Source1: lsb-celestia.desktop
 Source2: celestia.png
 Patch0: celestia-%{version}.patch
+Patch1: celestia-%{version}.libpng15.patch
 
 %description
 LSB conforming version of Celestia.  Celestia is a free real-time
@@ -26,6 +27,7 @@
 %prep
 %setup -q -n celestia-%{version}
 %patch0 -p1 -b .lsbcc
+%patch1 -p0 -b .png15
 
 %build
 # common environment settings
@@ -100,6 +102,9 @@
 %attr ( -   root root ) /opt/lsb/appbat
 
 %changelog
+* Wed Feb 13 2013 Stew Benedict <stewb at linux-foundation.org>
+- use a patch from Mageia for png15 build (P1)
+
 * Thu May 12 2011 Stew Benedict <stewb at linux-foundation.org>
 - use spec file to build, drop nALFS
 

=== modified file 'rpm/pkgchk.sh'
--- a/rpm/pkgchk.sh	2013-02-08 13:58:16 +0000
+++ b/rpm/pkgchk.sh	2013-02-13 15:22:34 +0000
@@ -11,7 +11,7 @@
 printf "inserting deps as needed for %s \n" "$ADDED_DEPS"
 printf "dot is a PASS, a number is a FAIL count\n"
 
-for spec in `ls *.spec | grep -v celestia`; do
+for spec in `ls *.spec`; do
   failed=""
   name=`basename "$spec" .spec`
   if [ "$name" == "lsb-expect" ];then