rpms/GLC_lib/devel GLC_lib_src_1.1.0-noGL.patch, NONE, 1.1 GLC_lib_src_1.1.0-nolib3ds.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 GLC_lib.spec, 1.4, 1.5 sources, 1.3, 1.4 GLC_lib_src_1.0.0-nolib3ds.patch, 1.1, NONE

Mon Mar 23 18:10:41 UTC 2009

Author: kwizart

Update of /cvs/pkgs/rpms/GLC_lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5009/devel

Modified Files:
	.cvsignore GLC_lib.spec sources 
Added Files:
	GLC_lib_src_1.1.0-noGL.patch GLC_lib_src_1.1.0-nolib3ds.patch 
	import.log 
Removed Files:
	GLC_lib_src_1.0.0-nolib3ds.patch 
Log Message:
Update to 1.1.0


GLC_lib_src_1.1.0-noGL.patch:

--- NEW FILE GLC_lib_src_1.1.0-noGL.patch ---
diff -up GLC_lib_src_1.1.0/glc_ext.h.noGL GLC_lib_src_1.1.0/glc_ext.h
--- GLC_lib_src_1.1.0/glc_ext.h.noGL	2009-03-23 18:09:53.000000000 +0100
+++ GLC_lib_src_1.1.0/glc_ext.h	2009-03-23 18:10:01.000000000 +0100
@@ -27,7 +27,7 @@
 #define GLC_EXT_H_
 
 #include <QtOpenGL>
-#include "glext/glext.h"
+#include <GL/glext.h>
 
 #if !defined(Q_OS_MAC)
 // ARB_vertex_buffer_object

GLC_lib_src_1.1.0-nolib3ds.patch:

--- NEW FILE GLC_lib_src_1.1.0-nolib3ds.patch ---
diff -up GLC_lib_src_1.1.0/glc_3dstoworld.cpp.nolib3ds GLC_lib_src_1.1.0/glc_3dstoworld.cpp
--- GLC_lib_src_1.1.0/glc_3dstoworld.cpp.nolib3ds	2009-02-28 20:16:16.000000000 +0100
+++ GLC_lib_src_1.1.0/glc_3dstoworld.cpp	2009-03-23 18:11:05.000000000 +0100
@@ -34,11 +34,11 @@
 #include "glc_vector2df.h"
 #include "glc_vector3df.h"
 // Lib3ds Header
-#include "lib3ds/file.h"
-#include "lib3ds/mesh.h"
-#include "lib3ds/node.h"
-#include "lib3ds/matrix.h"
-#include "lib3ds/material.h"
+#include <lib3ds/file.h>
+#include <lib3ds/mesh.h>
+#include <lib3ds/node.h>
+#include <lib3ds/matrix.h>
+#include <lib3ds/material.h>
 
 #include <QFileInfo>
 #include <QGLContext>
diff -up GLC_lib_src_1.1.0/GLC_lib.pro.nolib3ds GLC_lib_src_1.1.0/GLC_lib.pro
--- GLC_lib_src_1.1.0/GLC_lib.pro.nolib3ds	2009-03-02 21:02:22.000000000 +0100
+++ GLC_lib_src_1.1.0/GLC_lib.pro	2009-03-23 18:13:26.000000000 +0100
@@ -4,7 +4,9 @@ QT += opengl \
     core
 CONFIG += exceptions \
     release \
-    warn_on
+    warn_on \
+    link_pkgconfig
+
 TARGET = GLC_lib
 VERSION = 1.1.0
 
@@ -14,30 +16,8 @@ unix:UI_DIR = ./Build
 
 DEPENDPATH += .
 INCLUDEPATH += .
-
-# Input
-HEADERS_LIB3DS += lib3ds/atmosphere.h \
-           lib3ds/background.h \
-           lib3ds/camera.h \
-           lib3ds/chunk.h \
-           lib3ds/chunktable.h \
-           lib3ds/ease.h \
-           lib3ds/file.h \
-           lib3ds/io.h \
-           lib3ds/light.h \
-           lib3ds/material.h \
-           lib3ds/matrix.h \
-           lib3ds/mesh.h \
-           lib3ds/node.h \
-           lib3ds/quat.h \
-           lib3ds/shadow.h \
-           lib3ds/tcb.h \
-           lib3ds/tracks.h \
-           lib3ds/types.h \
-           lib3ds/vector.h \
-           lib3ds/viewport.h
-           
-HEADERS_GLEXT += glext/glext.h
+
+PKGCONFIG = lib3ds
 
 HEADERS_GLC += glc_utils_maths.h \
            glc_vector2d.h \
@@ -84,27 +64,8 @@ HEADERS_GLC += glc_utils_maths.h \
            glc_shader.h \
            glc_state.h
            
-HEADERS += $${HEADERS_LIB3DS} $${HEADERS_GLC} $${HEADERS_GLEXT}
+HEADERS += $${HEADERS_GLC}
 
-SOURCES += lib3ds/atmosphere.c \
-           lib3ds/background.c \
-           lib3ds/camera.c \
-           lib3ds/chunk.c \
-           lib3ds/ease.c \
-           lib3ds/file.c \
-           lib3ds/io.c \
-           lib3ds/light.c \
-           lib3ds/material.c \
-           lib3ds/matrix.c \
-           lib3ds/mesh.c \
-           lib3ds/node.c \
-           lib3ds/quat.c \
-           lib3ds/shadow.c \
-           lib3ds/tcb.c \
-           lib3ds/tracks.c \
-           lib3ds/vector.c \
-           lib3ds/viewport.c
-   
 SOURCES += glc_vector4d.cpp \
            glc_matrix4x4.cpp \
            glc_interpolator.cpp \
@@ -197,8 +158,8 @@ unix { 
     # Adds a -P to preserve link
 	QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
 	include.path = $${INCLUDE_DIR}/GLC_lib
-	include_lib3ds.path = $${INCLUDE_DIR}/GLC_lib/lib3ds
-	include_glext.path = $${INCLUDE_DIR}/GLC_lib/glext
+	include_lib3ds.path = $${INCLUDE_DIR}
+	include_glext.path = $${INCLUDE_DIR}
 }
 
 # Windows Install configuration
@@ -219,5 +180,5 @@ include_glext.files =$${HEADERS_GLEXT}
 target.path = $${LIB_DIR}
    
 # "make install" configuration options
-INSTALLS += target include_lib3ds include_glext include
+INSTALLS += target include
 


--- NEW FILE import.log ---
GLC_lib-1_1_0-1_fc10:HEAD:GLC_lib-1.1.0-1.fc10.src.rpm:1237831822


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GLC_lib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Aug 2008 15:07:47 -0000	1.3
+++ .cvsignore	23 Mar 2009 18:10:10 -0000	1.4
@@ -1 +1 @@
-GLC_lib_src_1.0.0.zip
+GLC_lib_src_1.1.0.zip


Index: GLC_lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GLC_lib/devel/GLC_lib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GLC_lib.spec	23 Feb 2009 21:14:33 -0000	1.4
+++ GLC_lib.spec	23 Mar 2009 18:10:10 -0000	1.5
@@ -1,15 +1,14 @@
-%define _default_patch_fuzz 2
-
 Name:           GLC_lib
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        C++ class library for OpenGL application based on Qt 4
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.glc-lib.net/
 Source0:        http://downloads.sourceforge.net/glc-lib/GLC_lib_src_%{version}.zip
-Patch0:         GLC_lib_src_1.0.0-nolib3ds.patch
+Patch0:         GLC_lib_src_1.1.0-nolib3ds.patch
+Patch1:         GLC_lib_src_1.1.0-noGL.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -36,12 +35,13 @@
 %prep
 %setup -q -n GLC_lib_src_%{version}
 %patch0 -p1 -b .nolib3ds
+%patch1 -p1 -b .noGL
 
 #Fix library Path on lib64
 sed -i -e 's|LIB_DIR = /usr/lib|LIB_DIR = %{_libdir}|' GLC_lib.pro
 
 # Fix internal use of lib3ds
-rm -rf lib3ds
+rm -rf lib3ds glext
 
 
 
@@ -53,7 +53,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libGLC_lib.prl
+#rm -rf $RPM_BUILD_ROOT%{_libdir}/libGLC_lib.prl
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,8 +76,8 @@
 
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Mar 23 2009 kwizart < kwizart at gmail.com > - 1.1.0-1
+- Update to 1.1.0
 
 * Thu Aug 14 2008 kwizart < kwizart at gmail.com > - 1.0.0-1
 - Update to 1.0.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GLC_lib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Aug 2008 15:07:47 -0000	1.3
+++ sources	23 Mar 2009 18:10:10 -0000	1.4
@@ -1 +1 @@
-f7774bfecbfc2fb8e3a5cbea8b2548c7  GLC_lib_src_1.0.0.zip
+e62ce3b3d7f8925bda8a51e9c0cf5e81  GLC_lib_src_1.1.0.zip


--- GLC_lib_src_1.0.0-nolib3ds.patch DELETED ---


