Author: gotar Date: Wed Feb 23 22:57:59 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- use system OGLFT (requires version with Qt support)
---- Files affected:
packages/lignumCAD:
lignumCAD.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: packages/lignumCAD/lignumCAD.spec
diff -u packages/lignumCAD/lignumCAD.spec:1.14
packages/lignumCAD/lignumCAD.spec:1.15
--- packages/lignumCAD/lignumCAD.spec:1.14 Tue Feb 22 01:46:59 2011
+++ packages/lignumCAD/lignumCAD.spec Wed Feb 23 23:57:54 2011
@@ -21,6 +21,7 @@
Patch11: %{name}-Xft.patch
Patch12: %{name}-qt3.patch
URL: http://lignumcad.sourceforge.net/
+BuildRequires: OGLFT-devel
BuildRequires: OpenCASCADE-devel >= 4
BuildRequires: OpenGL-GLU-devel >= 1.3
BuildRequires: freetype-devel >= 2.1.3
@@ -65,16 +66,16 @@
%patch11 -p1
%patch12 -p0
sed -i -e "s|/opt/lignumCAD|%{_datadir}/%{name}|" configuration.h
-sed -i -e 's/\(lib\)*emf.\(h\|cpp\)//g' lignumCAD.pro
+sed -i -e 's/\(OGLFT\|\(lib\)*emf\).\(h\|cpp\)//g' lignumCAD.pro
sed -i -e 's/DELETE /LDELETE/' constants.h command.cpp
-%{__rm} *emf.{h,cpp}
+%{__rm} {OGLFT,*emf}.{h,cpp}
%build
export QTDIR=/usr
qmake lignumCAD.pro \
- unix:LIBS="-lGL -lTKTopAlgo -lTKGeomAlgo -lTKBRep -lTKGeomBase -lTKG3d
-lTKG2d -lTKMath -lTKernel -lfontconfig -lTKMesh -lTKBool -lTKBO -lTKPrim
-lEMF" \
+ unix:LIBS="-lGL -lTKTopAlgo -lTKGeomAlgo -lTKBRep -lTKGeomBase -lTKG3d
-lTKG2d -lTKMath -lTKernel -lfontconfig -lTKMesh -lTKBool -lTKBO -lTKPrim -lEMF
-lOGLFT" \
-after \
- unix:INCLUDEPATH+=%{_includedir}/{OpenCASCADE,X11/Xft,freetype2,libEMF}
\
+
unix:INCLUDEPATH+=%{_includedir}/{OpenCASCADE,X11/Xft,freetype2,libEMF,oglft} \
en_documentation.files='' \
en_documentation_graphics.files='' \
en_so_documentation.files='' \
@@ -122,6 +123,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2011/02/23 22:57:54 gotar
+- use system OGLFT (requires version with Qt support)
+
Revision 1.14 2011/02/22 00:46:59 gotar
- make sure to include system emf.h
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lignumCAD/lignumCAD.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
