rpms/jasper/FC-4 jasper-1.701.0-GL.patch, NONE, 1.1 jasper.spec, 1.5, 1.6

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20327/FC-4

Modified Files:
	jasper.spec 
Added Files:
	jasper-1.701.0-GL.patch 
Log Message:
* Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-7
- GL patch to remove libGL dependancy (using only freeglut)


jasper-1.701.0-GL.patch:

--- NEW FILE jasper-1.701.0-GL.patch ---
--- jasper-1.701.0/configure.ac.GL	2004-02-08 19:41:29.000000000 -0600
+++ jasper-1.701.0/configure.ac	2005-10-18 08:09:24.000000000 -0500
@@ -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 $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
 	fi
--- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
+++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
@@ -9465,7 +9465,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 $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
 		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


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jasper.spec	18 Oct 2005 12:51:39 -0000	1.5
+++ jasper.spec	18 Oct 2005 13:10:33 -0000	1.6
@@ -10,7 +10,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 5%{?dist}
+Release: 7%{?dist}
 
 License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -19,7 +19,6 @@
 
 BuildRequires: libjpeg-devel
 BuildRequires: freeglut-devel
-BuildRequires: libGL-devel
 
 %description
 This package contains an implementation of the image compression
@@ -41,11 +40,16 @@
 
 %build
 %configure \
+  --enable-shared \
   --disable-static 
 
 make %{?_smp_mflags}
 
 
+%check
+make check
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,6 +87,13 @@
 
 
 %changelog
+* Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-7
+- GL patch to remove libGL dependancy (using only freeglut)
+
+* Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-6
+- token %%check section
+- --enable-shared 
+
 * Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-5
 - use %%{?dist}
 - BR: libGL-devel