From 022aeb89721181c0a95e66ee9bc1aeaa02e5ede1 Mon Sep 17 00:00:00 2001
From: Andrey Bondrov <andrey.bondrov@rosalab.ru>
Date: Fri, 20 Jun 2014 18:52:41 +1100
Subject: [PATCH] More cleanups

---
 .abf.yml     |   2 --
 freecad.spec | 100 +++++++++++++++++++++++++--------------------------
 2 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index e8877e8..8b6651b 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,2 @@
-removed_sources:
-  freecad-0.10.3247.tar.gz: c4f37b76256562452bde096ab8498e5758861fe9
 sources:
   freecad-0.13.1830.tar.gz: 82d58b91a28a4cd5d138666d2ed0f36bf18c0255
diff --git a/freecad.spec b/freecad.spec
index 79f2d00..34e6e0c 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -9,56 +9,67 @@ Source0:	http://dfn.dl.sourceforge.net/sourceforge/free-cad/freecad-%{version}.t
 Source1:	freecad.desktop
 Source2:	freecad.1
 Source3:	%{name}.rpmlintrc
-BuildRequires: 	gstreamer0.10-devel
-BuildRequires: 	qt4-devel
-BuildRequires: 	libxerces-c-devel
-BuildRequires: 	opencv-devel
-BuildRequires: 	python-devel
-BuildRequires: 	libode-devel
-BuildRequires: 	python-matplotlib
-BuildRequires: 	eigen3
-BuildRequires: 	cmake
-BuildRequires: 	gcc-gfortran
-BuildRequires: 	opencascade-devel
-BuildRequires: 	coin-devel
-BuildRequires: 	soqt-devel
-BuildRequires: 	boost-devel >= 1.34.0
+BuildRequires:	cmake
+BuildRequires:	eigen3
+BuildRequires:	gcc-gfortran
+BuildRequires:	python-matplotlib
+BuildRequires:	boost-devel
+BuildRequires:	opencascade-devel
+BuildRequires:	qt4-devel
+BuildRequires:	soqt-devel
+BuildRequires:	pkgconfig(Coin)
+BuildRequires:	pkgconfig(gstreamer-0.10)
+BuildRequires:	pkgconfig(ode)
+BuildRequires:	pkgconfig(opencv)
+BuildRequires:	pkgconfig(python)
+BuildRequires:	pkgconfig(xerces-c)
 
 %description
 FreeCAD will be a general purpose 3D CAD modeler.
-The development will be completely Open Source.
-As with many modern 3D CAD modelers it will
-have a 2D component in order to extract design detail
-from the 3D model to create 2D production drawings,
-although 2D (e.g. AutoCAD LT) is not the focus,
-neither are animation and organic shapes
-(e.g. Maya, 3D StudioMAX and Cinema 4D).
+
+The development will be completely Open Source. As with many modern 3D CAD
+modelers it will have a 2D component in order to extract design detail from
+the 3D model to create 2D production drawings, although 2D (e.g. AutoCAD LT)
+is not the focus, neither are animation and organic shapes (e.g. Maya,
+3D StudioMAX and Cinema 4D).
+
+%files
+%doc ChangeLog.txt copying.lib data/License.txt build/doc/*
+%{_bindir}/*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_libdir}/%{name}/bin/
+%{_libdir}/%{name}/lib/
+%{_libdir}/%{name}/Mod/
+%{_datadir}/%{name}/
+%{_mandir}/man1/*.1*
+
+#----------------------------------------------------------------------------
 
 %package devel
-Group: Development/C++
-Summary: Devel package for %{name}
-Requires: %{name} = %{version}
+Summary:	Devel package for %{name}
+Requires:	%{name} = %{version}
+Group:		Development/C++
 
 %description devel
-FreeCAD will be a general purpose 3D CAD modeler.
-The development will be completely Open Source.
-As with many modern 3D CAD modelers it will
-have a 2D component in order to extract design detail
-from the 3D model to create 2D production drawings,
-although 2D (e.g. AutoCAD LT) is not the focus,
-neither are animation and organic shapes
-(e.g. Maya, 3D StudioMAX and Cinema 4D).
+Development files for FreeCAD.
+
+%files devel
+%{_libdir}/%{name}/include/*
+
+#----------------------------------------------------------------------------
 
 %prep
-%setup -q 
+%setup -q
 
 %build
 %define Werror_cflags %nil
-%cmake_qt4 -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
-	    -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
-            -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
-            -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-            -DRESOURCEDIR=%{_libdir}/freecad
+%cmake_qt4 \
+	-DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
+	-DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
+	-DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
+	-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
+	-DRESOURCEDIR=%{_libdir}/freecad
 %make
 
 %install
@@ -91,16 +102,3 @@ ln -sf %{name}.1.gz FreeCAD.1.gz.
 ln -sf %{name}.1.gz FreeCADCmd.1.gz
 popd
 
-%files
-%doc ChangeLog.txt copying.lib data/License.txt build/doc/*
-%{_bindir}/*
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_libdir}/%{name}/bin/
-%{_libdir}/%{name}/lib/
-%{_libdir}/%{name}/Mod/
-%{_datadir}/%{name}/
-%{_mandir}/man1/*.1*
-
-%files devel
-%{_libdir}/%{name}/include/*