rpms/jasper/FC-4 jasper-1.701.0-GL.patch, 1.1, 1.2 jasper.spec, 1.6, 1.7

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	jasper-1.701.0-GL.patch jasper.spec 
Log Message:
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
  (#179464)

* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
- revert jasper to jaspertool rename (#176773)
- actually use/apply GL patch


jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper-1.701.0-GL.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jasper-1.701.0-GL.patch	18 Oct 2005 13:10:33 -0000	1.1
+++ jasper-1.701.0-GL.patch	31 Jan 2006 17:01:33 -0000	1.2
@@ -1,14 +1,3 @@
---- 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 @@
@@ -16,7 +5,7 @@
  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"
++		TMPLIBS="-lglut"
  		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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jasper.spec	18 Oct 2005 13:10:33 -0000	1.6
+++ jasper.spec	31 Jan 2006 17:01:33 -0000	1.7
@@ -1,4 +1,3 @@
-# $Id$
 
 # NOTE: packages can use jasper:
 # ImageMagick
@@ -10,15 +9,21 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 7%{?dist}
+Release: 9%{?dist}
 
 License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: jasper-1.701.0-GL.patch
+
 BuildRequires: libjpeg-devel
 BuildRequires: freeglut-devel
+# workaround: 
+#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+#  http://bugzilla.redhat.com/bugzilla/179464
+BuildRequires: libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -37,6 +42,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .GL
+
 
 %build
 %configure \
@@ -46,7 +53,7 @@
 make %{?_smp_mflags}
 
 
-%check
+%check ||:
 make check
 
 
@@ -61,13 +68,17 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 # avoid conflict(s) with tomcat
-mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
+# not needed anymore, see bz #176773
+# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
 
 
 %files
 %defattr(-,root,root)
 %doc COPYRIGHT LICENSE NEWS README
-%{_bindir}/*
+%{_bindir}/imgcmp
+%{_bindir}/jiv
+%{_bindir}/imginfo
+%{_bindir}/jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -87,6 +98,14 @@
 
 
 %changelog
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
+- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+  (#179464)
+
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
+- revert jasper to jaspertool rename (#176773)
+- actually use/apply GL patch
+
 * Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-7
 - GL patch to remove libGL dependancy (using only freeglut)