rpms/mesa-libGLw/devel mesa-6.5.1-libGLw.patch, 1.1, 1.2 mesa-libGLw.spec, 1.1, 1.2
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Fri Sep 29 17:02:30 UTC 2006
Author: ajax
Update of /cvs/extras/rpms/mesa-libGLw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29282
Modified Files:
mesa-6.5.1-libGLw.patch mesa-libGLw.spec
Log Message:
* Fri Sep 29 2006 Adam Jackson <ajackson at redhat.com> 6.5.1-1
- lib64 fixes and cleanups from Patrice Dumas (#188974)
mesa-6.5.1-libGLw.patch:
Index: mesa-6.5.1-libGLw.patch
===================================================================
RCS file: /cvs/extras/rpms/mesa-libGLw/devel/mesa-6.5.1-libGLw.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-6.5.1-libGLw.patch 29 Sep 2006 16:30:53 -0000 1.1
+++ mesa-6.5.1-libGLw.patch 29 Sep 2006 17:02:30 -0000 1.2
@@ -1,6 +1,6 @@
---- Mesa-6.5.1/configs/default.motif 2006-09-11 17:35:46.000000000 -0400
-+++ Mesa-6.5.1/configs/default 2006-09-19 11:41:44.000000000 -0400
-@@ -55,16 +55,16 @@
+--- Mesa-6.5.1/configs/default.motif 2006-09-28 13:04:05.000000000 +0200
++++ Mesa-6.5.1/configs/default 2006-09-28 13:04:37.000000000 +0200
+@@ -55,12 +55,12 @@
# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
# order to build the Motif widget too)
@@ -15,17 +15,12 @@
GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa
# Which subdirs under $(TOP)/progs/ to enter:
--PROGRAM_DIRS = demos redbook samples xdemos
-+PROGRAM_DIRS =
-
-
- # Library/program dependencies
@@ -73,7 +73,7 @@
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
-+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm $(EXTRA_LIB_PATH) -lXt -lX11
++GLW_LIB_DEPS = -l$(GL_LIB) -lXt -lX11
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
Index: mesa-libGLw.spec
===================================================================
RCS file: /cvs/extras/rpms/mesa-libGLw/devel/mesa-libGLw.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-libGLw.spec 29 Sep 2006 16:30:53 -0000 1.1
+++ mesa-libGLw.spec 29 Sep 2006 17:02:30 -0000 1.2
@@ -4,7 +4,7 @@
Summary: Xt / Motif OpenGL widgets
Name: mesa-libGLw
Version: 6.5.1
-Release: 0.2%{?dist}
+Release: 1%{?dist}
License: MIT/X11
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -52,29 +52,13 @@
#-- Build ------------------------------------------------------------
%build
-# Macroize this to simplify things
-export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
-export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
-export DRI_DRIVER_DIR="%{_libdir}/dri"
-make OPT_FLAGS="$RPM_OPT_FLAGS" linux
+make OPT_FLAGS="$RPM_OPT_FLAGS" LIB_DIR=%{_lib} linux
#-- Install ----------------------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT
-# total hack job, since make install won't do what we want at all
-export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
-export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}/GL
-{
- mkdir -p ${LIB_DIR}
- mkdir -p ${INCLUDE_DIR}
- install -m0755 %{_lib}/libGLw.so.1.0.0 ${LIB_DIR}
- ( cd ${LIB_DIR} && ln -s libGLw.so.1.0.0 libGLw.so.1 && ln -s libGLw.so.1 libGLw.so )
- install -m0644 src/glw/GLwDrawA.h ${INCLUDE_DIR}
- install -m0644 src/glw/GLwMDrawA.h ${INCLUDE_DIR}
- install -m0644 src/glw/GLwMDrawAP.h ${INCLUDE_DIR}
- install -m0644 src/glw/GLwDrawAP.h ${INCLUDE_DIR}
-}
+make install INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix} LIB_DIR=%{_lib}
#-- Clean ------------------------------------------------------------
%clean
@@ -101,6 +85,9 @@
%{_includedir}/GL/GLwMDrawAP.h
%changelog
+* Fri Sep 29 2006 Adam Jackson <ajackson at redhat.com> 6.5.1-1
+- lib64 fixes and cleanups from Patrice Dumas (#188974)
+
* Tue Sep 19 2006 Adam Jackson <ajackson at redhat.com> 6.5.1-0.2
- Use 6.5.1 release tarball. Drop patches and build scripts that are no
longer necessary.
More information about the scm-commits
mailing list