rpms/jasper/devel jasper-1.701.0-GL.patch, 1.3, 1.4 jasper.spec, 1.11, 1.12

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26928

Modified Files:
	jasper-1.701.0-GL.patch jasper.spec 
Log Message:
* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-11
- fixup build issues introduced by geojasper integration


jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper-1.701.0-GL.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jasper-1.701.0-GL.patch	1 Mar 2006 16:30:23 -0000	1.3
+++ jasper-1.701.0-GL.patch	1 Mar 2006 18:12:26 -0000	1.4
@@ -9,14 +9,3 @@
  		echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then
---- jasper-1.701.0.GEO/configure.ac.GL	2006-02-20 19:58:02.000000000 -0600
-+++ jasper-1.701.0.GEO/configure.ac	2006-02-24 07:40:38.000000000 -0600
-@@ -242,7 +242,7 @@
- OPENGL_LIBS=""
- if test $ENABLE_OPENGL = yes; then
- 	if test $HAVE_OPENGL = no; then
--		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut"
- 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
- 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
- 	fi


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jasper.spec	1 Mar 2006 16:30:23 -0000	1.11
+++ jasper.spec	1 Mar 2006 18:12:26 -0000	1.12
@@ -12,7 +12,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: JasPer License Version 2.0
 %if "%{?geo:1}" == "1"
@@ -27,6 +27,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: jasper-1.701.0-GL.patch
+# autoconf/automake bits of patch1
+Patch2: jasper-1.701.0-GL-ac.patch
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
@@ -57,6 +59,7 @@
 
 %if "%{?geo:1}" == "1"
 chmod +x configure configure.ac
+%patch2 -p1 -b .GL-ac
 libtoolize --force
 aclocal
 autoconf
@@ -115,6 +118,9 @@
 
 
 %changelog
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-11
+- fixup build issues introduced by geojasper integration
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-10
 - support/use geojasper (optional, default no)
 - fc5: gcc/glibc respin