Author: gotar Date: Mon Feb 21 23:54:40 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- patched project for contemporary tools (thanks to Fred R. Beck),
- Qt3 doesn't expose selected font filename which is required for OGLFT
(it was possible in Qt2 and so it is in Qt4), hardcoded default font,
- added BRs, fixed URL, paths (FHS), linking, use %doc, release 1
---- Files affected:
packages/lignumCAD:
lignumCAD.spec (1.11 -> 1.12) , lignumCAD-qt3.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/lignumCAD/lignumCAD.spec
diff -u packages/lignumCAD/lignumCAD.spec:1.11
packages/lignumCAD/lignumCAD.spec:1.12
--- packages/lignumCAD/lignumCAD.spec:1.11 Wed Apr 11 01:29:02 2007
+++ packages/lignumCAD/lignumCAD.spec Tue Feb 22 00:54:35 2011
@@ -3,17 +3,31 @@
Summary(pl.UTF-8): lignumCAD - program do komputerowo wspomaganego
projektowania mebli
Name: lignumCAD
Version: 0.2
-Release: 0.1
+Release: 1
License: GPL/LGPL
Group: X11/Applications/Science
Source0: %{name}.tar.gz
Patch0: %{name}-gcc3.patch
+Patch1: %{name}-gcc34.patch
+Patch2: %{name}-gcc4.patch
+Patch3: %{name}-gcc41.patch
+Patch4: %{name}-gcc42.patch
+Patch5: %{name}-gcc43.patch
+Patch6: %{name}-gcc44.patch
+Patch7: %{name}-gcc-enum-warning.patch
+Patch8: %{name}-delete-pointer.patch
+Patch9: %{name}-ui.patch
+Patch10: %{name}-xft.patch
+Patch11: %{name}-Xft.patch
+Patch12: %{name}-qt3.patch
+URL: http://lignumcad.sourceforge.net/
+BuildRequires: OpenCASCADE-devel >= 4
+BuildRequires: OpenGL-GLU-devel >= 1.3
+BuildRequires: freetype-devel >= 2.1.3
+BuildRequires: qmake
BuildRequires: qt-devel >= 3:3.0.6
-#BuildRequires: OpenCASCADE-devel >= 4
-#BuildRequires: OpenGL-devel >= 4.1
-#BuildRequires: freetype-devel >= 2.1.3
-URL: http://www.lignumcomputing.com/lignumcad/
-#URL: http://lignumcad.sourceforge.net
+BuildRequires: sed >= 4.0
+Requires: fonts-TTF-DejaVu
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -36,38 +50,67 @@
%prep
%setup -q -n %{name}
-# only partial (to the point where OpenCascade is required), needs finishing
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p0
+sed -i -e "s|/opt/lignumCAD|%{_datadir}/%{name}|" configuration.h
%build
export QTDIR=/usr
-qmake lignumCAD.pro
+qmake lignumCAD.pro \
+ unix:LIBS="-lGL -lTKTopAlgo -lTKGeomAlgo -lTKBRep -lTKGeomBase -lTKG3d
-lTKG2d -lTKMath -lTKernel -lfontconfig -lTKMesh -lTKBool -lTKBO -lTKPrim" \
+ -after \
+ unix:INCLUDEPATH+=%{_includedir}/{freetype2,X11/Xft,OpenCASCADE} \
+ en_documentation.files='' \
+ en_documentation_graphics.files='' \
+ en_so_documentation.files='' \
+ en_so_documentation_graphics.files='' \
+ de_documentation_graphics.files='' \
+ de_so_documentation.files='' \
+ translations.path=%{_datadir}/%{name}/v%{version}/translations \
+ materials.path=%{_datadir}/%{name}/v%{version}/material \
+ material_images.path=%{_datadir}/%{name}/v%{version}/material/images \
+ target.path=%{_bindir}
+
%{__make} \
- CXXFLAGS="%{rpmcflags} -pipe -Wall -W -D_REENTRANT -DOGLFT_NO_SOLID
-DGL2PS_USE_QT -DGL2PS_USE_EMF -DQT_THREAD_SUPPORT -I/usr/X11R6/include"
+ CXXFLAGS="%{rpmcflags} -pipe -Wall -W -D_REENTRANT -DOGLFT_NO_SOLID
-DGL2PS_USE_QT -DGL2PS_USE_EMF -DQT_THREAD_SUPPORT"
%install
rm -rf $RPM_BUILD_ROOT
+export QTDIR=/usr
%{__make} install \
- prefix=$RPM_BUILD_ROOT%{_prefix}
+ INSTALL_ROOT=$RPM_BUILD_ROOT
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/v%{version}/material{,s}
+%{__ln_s} %{_docdir}/%{name}-%{version}
$RPM_BUILD_ROOT%{_datadir}/%{name}/v%{version}/doc
+%{__ln_s} %{name}_en.qm
$RPM_BUILD_ROOT%{_datadir}/%{name}/v%{version}/translations/%{name}_C.qm
+%{__ln_s} %{name}_C.qm
$RPM_BUILD_ROOT%{_datadir}/%{name}/v%{version}/translations/qt_C.qm
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc
-%dir /opt/lignumCAD
-%dir /opt/lignumCAD/v%{version}
-%dir /opt/lignumCAD/v%{version}/bin
-%dir /opt/lignumCAD/v%{version}/doc
-%dir /opt/lignumCAD/v%{version}/translations
-%dir /opt/lignumCAD/v%{version}/materials
-/opt/lignumCAD/v%{version}/bin/lignumCAD
-%docdir /opt/lignumCAD/v%{version}/doc
-/opt/lignumCAD/v%{version}/doc
-/opt/lignumCAD/v%{version}/translations
-/opt/lignumCAD/v%{version}/materials
+%doc AUTHORS README doc/*
+%attr(755,root,root) %{_bindir}/%{name}
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/v%{version}
+%{_datadir}/%{name}/v%{version}/doc
+%{_datadir}/%{name}/v%{version}/materials
+%dir %{_datadir}/%{name}/v%{version}/translations
+%lang(de) %{_datadir}/%{name}/v%{version}/translations/*_de.qm
+%{_datadir}/%{name}/v%{version}/translations/%{name}_en.qm
+%{_datadir}/%{name}/v%{version}/translations/*_C.qm
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -75,6 +118,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2011/02/21 23:54:35 gotar
+- patched project for contemporary tools (thanks to Fred R. Beck),
+- Qt3 doesn't expose selected font filename which is required for OGLFT
+ (it was possible in Qt2 and so it is in Qt4), hardcoded default font,
+- added BRs, fixed URL, paths (FHS), linking, use %doc, release 1
+
Revision 1.11 2007/04/10 23:29:02 shadzik
- qt-devel epoch 3
================================================================
Index: packages/lignumCAD/lignumCAD-qt3.patch
diff -u /dev/null packages/lignumCAD/lignumCAD-qt3.patch:1.1
--- /dev/null Tue Feb 22 00:54:40 2011
+++ packages/lignumCAD/lignumCAD-qt3.patch Tue Feb 22 00:54:35 2011
@@ -0,0 +1,13 @@
+--- systemdependencies.cpp.orig 2002-12-18 15:10:37.000000000 +0100
++++ systemdependencies.cpp 2011-02-21 23:39:50.000000000 +0100
+@@ -42,6 +42,10 @@ namespace System {
+ QFont qfont;
+ qfont.fromString( font );
+
++ file="/usr/share/fonts/TTF/DejaVuSerif.ttf";
++ point_size=13;
++ return true;
++
+ bool found_file = false, found_point_size = false;
+
+ #if defined( Q_WS_X11 )
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lignumCAD/lignumCAD.spec?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
