[armacycles-ad] libpng15.

Jon Ciesla limb at fedoraproject.org
Tue Dec 13 14:33:50 UTC 2011


commit 161d919aec20319a3b2969c280dfe02a3680fa2c
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Dec 13 08:33:41 2011 -0600

    libpng15.

 armacycles-ad-0.2.8.3.1-libpng15.patch |   22 ++++++++++++++++++++++
 armacycles-ad.spec                     |    8 +++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/armacycles-ad-0.2.8.3.1-libpng15.patch b/armacycles-ad-0.2.8.3.1-libpng15.patch
new file mode 100644
index 0000000..a0aa89d
--- /dev/null
+++ b/armacycles-ad-0.2.8.3.1-libpng15.patch
@@ -0,0 +1,22 @@
+--- configure.ac.orig	2011-12-13 08:17:13.266755392 -0600
++++ configure.ac	2011-12-13 08:17:17.401280868 -0600
+@@ -724,16 +724,14 @@
+ AC_MSG_ERROR([You need libz to compile Armagetron.]))
+ 
+ AC_MSG_CHECKING(whether libpng is installed)
+-if PNGLIBS=`libpng-config --libs`; then
++if PNGLIBS=`libpng15-config --libs`; then
+     AC_MSG_RESULT(yes)
+ fi
+ 
+-CPPFLAGS="$CPPFLAGS `libpng-config --cflags`"
++CPPFLAGS="$CPPFLAGS `libpng15-config --cflags`"
+ LIBS="$LIBS $PNGLIBS"
+ 
+-AC_CHECK_FUNC(png_check_sig,
+-,
+-AC_MSG_ERROR([You need libpng to compile Armagetron.]))
++dnl AC_MSG_ERROR([You need libpng to compile Armagetron.]))
+ 
+ AC_CHECK_LIB(jpeg, main,,
+ 	AC_MSG_WARN([
diff --git a/armacycles-ad.spec b/armacycles-ad.spec
index 395f4fa..27874b4 100644
--- a/armacycles-ad.spec
+++ b/armacycles-ad.spec
@@ -1,6 +1,6 @@
 Name: armacycles-ad
 Version: 0.2.8.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: A lightcycle game in 3D
 
 Group: Amusements/Games
@@ -26,6 +26,7 @@ Source2: armacycles-ad.desktop
 #Patch14: armacycles-ad-0.2.8.2.1-tErrorcpp-stringh.patch
 #Patch15: armacycles-ad-0.2.8.2.1-tError-cstdlib.patch
 #Patch16: armacycles-ad-0.2.8.2.1-tRandom-cstdlib.patch
+Patch17: armacycles-ad-0.2.8.3.1-libpng15.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel >= 2.6.12, SDL_image-devel, SDL_mixer-devel
@@ -77,6 +78,8 @@ rm -f armagetronad-0.2.8.2.1/textures/KGN*
 #%patch14 -p0
 #%patch15 -p0
 #%patch16 -p0
+%patch17 -p0
+autoreconf
 
 %build
 configure_flags="--disable-sysinstall --disable-games --disable-uninstall"
@@ -174,6 +177,9 @@ fi
 
 
 %changelog
+* Tue Dec 13 2011 Jon Ciesla <limburgher at gmail.com> - 0.2.8.3.1-5
+- Patch for new libpng.
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.2.8.3.1-4
 - Rebuild for new libpng
 


More information about the scm-commits mailing list