rpms/GLC_lib/devel GLC_lib_src_1.0.0-nolib3ds.patch, NONE, 1.1 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 GLC_lib.spec, 1.2, 1.3
Chauvet Nicolas (kwizart)
fedora-extras-commits at redhat.com
Thu Aug 14 15:08:17 UTC 2008
Author: kwizart
Update of /cvs/pkgs/rpms/GLC_lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29559
Modified Files:
sources .cvsignore GLC_lib.spec
Added Files:
GLC_lib_src_1.0.0-nolib3ds.patch
Log Message:
- Update to 1.0.0
GLC_lib_src_1.0.0-nolib3ds.patch:
--- NEW FILE GLC_lib_src_1.0.0-nolib3ds.patch ---
diff -up GLC_lib_src_1.0.0/GLC_lib.pro.nolib3ds GLC_lib_src_1.0.0/GLC_lib.pro
--- GLC_lib_src_1.0.0/GLC_lib.pro.nolib3ds 2008-08-07 20:47:10.000000000 +0200
+++ GLC_lib_src_1.0.0/GLC_lib.pro 2008-08-14 16:56:07.000000000 +0200
@@ -4,7 +4,8 @@ QT += opengl \
core
CONFIG += exceptions \
release \
- warn_on
+ warn_on \
+ link_pkgconfig
TARGET = GLC_lib
VERSION = 1.0.0
@@ -15,29 +16,11 @@ unix:UI_DIR = ./Build
DEPENDPATH += .
INCLUDEPATH += .
+PKGCONFIG = lib3ds
+
# Input
-HEADERS += 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 += glc_utils_maths.h \
+HEADERS = glc_utils_maths.h \
glc_vector2d.h \
glc_vector2df.h \
glc_vector3d.h \
@@ -80,25 +63,7 @@ HEADERS += glc_utils_maths.h \
glc_3dstoworld.h \
glc_geomtools.h
-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_vector3d.cpp \
glc_vector2d.cpp \
diff -up GLC_lib_src_1.0.0/glc_3dstoworld.cpp.nolib3ds GLC_lib_src_1.0.0/glc_3dstoworld.cpp
--- GLC_lib_src_1.0.0/glc_3dstoworld.cpp.nolib3ds 2008-08-10 16:38:22.000000000 +0200
+++ GLC_lib_src_1.0.0/glc_3dstoworld.cpp 2008-08-14 16:54:21.000000000 +0200
@@ -36,11 +36,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>
GLC_3dsToWorld::GLC_3dsToWorld(const QGLContext *pContext)
: m_pWorld(NULL)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GLC_lib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 May 2008 11:16:28 -0000 1.2
+++ sources 14 Aug 2008 15:07:47 -0000 1.3
@@ -1 +1 @@
-5b9e834711cb2d25b9c1d7c707080d90 GLC_lib_src_0_9_8.zip
+f7774bfecbfc2fb8e3a5cbea8b2548c7 GLC_lib_src_1.0.0.zip
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GLC_lib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 May 2008 11:16:28 -0000 1.2
+++ .cvsignore 14 Aug 2008 15:07:47 -0000 1.3
@@ -1 +1 @@
-GLC_lib_src_0_9_8.zip
+GLC_lib_src_1.0.0.zip
Index: GLC_lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GLC_lib/devel/GLC_lib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GLC_lib.spec 18 May 2008 11:31:50 -0000 1.2
+++ GLC_lib.spec 14 Aug 2008 15:07:47 -0000 1.3
@@ -1,15 +1,19 @@
+%define _default_patch_fuzz 2
+
Name: GLC_lib
-Version: 0.9.8
-Release: 3%{?dist}
+Version: 1.0.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_0_9_8.zip
+Source0: http://downloads.sourceforge.net/glc-lib/GLC_lib_src_%{version}.zip
+Patch0: GLC_lib_src_1.0.0-nolib3ds.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: qt-devel
+BuildRequires: qt4-devel
+BuildRequires: lib3ds-devel
%description
@@ -21,8 +25,7 @@
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: qt-devel
-
+Requires: qt4-devel
%description devel
The %{name}-devel package contains libraries and header files for
@@ -31,24 +34,24 @@
%prep
-%setup -q -c
+%setup -q -n GLC_lib_src_%{version}
+%patch0 -p1 -b .nolib3ds
#Fix library Path on lib64
-sed -i -e 's|LIB_DIR = /usr/lib|LIB_DIR = %{_libdir}|' src/GLC_lib.pro
-#Fix eol encoding
-cp -p src/COPYING src/COPYING.eol
-sed -i 's/\r//' src/COPYING
-touch -r src/COPYING.eol src/COPYING
+sed -i -e 's|LIB_DIR = /usr/lib|LIB_DIR = %{_libdir}|' GLC_lib.pro
+
+# Fix internal use of lib3ds
+rm -rf lib3ds
+
+
%build
-cd src
qmake-qt4 GLC_lib.pro
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-cd src
make install INSTALL_ROOT=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_libdir}/libGLC_lib.prl
@@ -63,7 +66,7 @@
%files
%defattr(-,root,root,-)
-%doc src/COPYING
+%doc COPYING
%{_libdir}/*.so.*
%files devel
@@ -73,11 +76,14 @@
%changelog
-* Sat May 17 2008 kwizart < kwizart at gmail.com > - 0.9.8-3
-- Fix COPYING end-of-line encoding
+* Thu Aug 14 2008 kwizart < kwizart at gmail.com > - 1.0.0-1
+- Update to 1.0.0
-* Wed May 14 2008 kwizart < kwizart at gmail.com > - 0.9.8-2
-- Rebuild for F-9
+* Wed May 28 2008 kwizart < kwizart at gmail.com > - 0.9.9-1
+- Update to 0.9.9
+
+* Sat May 17 2008 kwizart < kwizart at gmail.com > - 0.9.8-2
+- Fix COPYING end-of-line encoding
* Mon Feb 11 2008 kwizart < kwizart at gmail.com > - 0.9.8-1
- Initial spec file
More information about the scm-commits
mailing list