Merge pull request #2 from djam/freecad:rosa2012.1

Up 2 release

freecad.desktop

@@ -10,7 +10,7 @@ GenericName=CAD Application
 GenericName[de]=CAD-Anwendung
 GenericName[ru]=САПР
 Exec=/usr/bin/FreeCAD %F
-Path=/usr/@lib@/freecad
+Path=/usr/@lib@
 Terminal=false
 Type=Application
 Icon=freecad

freecad.spec

@@ -1,8 +1,8 @@
-Name: 	freecad
-Summary: FreeCAD is a general purpose 3D CAD modeler
-Version: 0.14.3702
-Release: 1
-License: GPL and LGPL
+Name:		freecad
+Summary:	FreeCAD is a general purpose 3D CAD modeler
+Version:	0.14.3702
+Release:	2
+License:	GPL and LGPL
 Group: 		Graphics
 Url:		http://free-cad.sourceforge.net/
 Source0:	http://dfn.dl.sourceforge.net/sourceforge/free-cad/freecad-%{version}.tar.gz
@@ -10,8 +10,10 @@ Source1:      	freecad.desktop
 Source2:      	freecad.1
 Source3:	%{name}.rpmlintrc
 BuildRequires: 	gstreamer0.10-devel
-BuildRequires: 	qt4-devel
-BuildRequires: 	libxerces-c-devel
+BuildRequires: 	pkgconfig(QtCore)
+BuildRequires:	doxygen
+BuildRequires:	pkgconfig(QtWebKit)
+BuildRequires: 	pkgconfig(xerces-c)
 BuildRequires: 	opencv-devel
 BuildRequires: 	python-devel
 BuildRequires: 	libode-devel
@@ -20,11 +22,13 @@ BuildRequires: 	eigen3
 BuildRequires: 	cmake
 BuildRequires: 	gcc-gfortran
 BuildRequires: 	opencascade-devel
-BuildRequires: 	coin-devel
+BuildRequires: 	pkgconfig(Coin)
 BuildRequires: 	soqt-devel
 BuildRequires: 	boost-devel >= 1.34.0
 BuildRequires:	pkgconfig(shiboken)
 BuildRequires:	pkgconfig(pyside)
+BuildRequires:	dos2unix
+
 
 %description
 FreeCAD will be a general purpose 3D CAD modeler.
@@ -60,7 +64,9 @@ neither are animation and organic shapes
 	    -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
             -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
             -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-            -DRESOURCEDIR=%{_libdir}/freecad
+            -DRESOURCEDIR=%{_libdir}/freecad \
+            -DFREECAD_USE_EXTERNAL_PIVY=1 \
+            -DCMAKE_BUILD_TYPE=Release 
 %make
 
 %install