Updated to release 0.15, updated Descritpion, S1 and S100, dropped P1

This commit is contained in:
Giovanni Mariani 2016-01-11 21:18:23 +01:00
parent cb434bde19
commit 53e237d851
3 changed files with 72 additions and 49 deletions

View file

@ -1,5 +1,4 @@
[Desktop Entry] [Desktop Entry]
Version=1.0
Name=FreeCAD Name=FreeCAD
Name[de]=FreeCAD Name[de]=FreeCAD
Name[ru]=FreeCAD Name[ru]=FreeCAD
@ -9,12 +8,11 @@ Comment[ru]=Параметрический трехмерный редактор
GenericName=CAD Application GenericName=CAD Application
GenericName[de]=CAD-Anwendung GenericName[de]=CAD-Anwendung
GenericName[ru]=САПР GenericName[ru]=САПР
Exec=/usr/bin/FreeCAD %F Exec=FreeCAD %F
Path=/usr/@lib@/freecad Path=/usr/@lib@/freecad
Terminal=false Terminal=false
Type=Application Type=Application
Icon=freecad Icon=freecad
Categories=Graphics;Science;Education;Engineering; Categories=Graphics;Science;Education;Engineering;
StartupNotify=true StartupNotify=true
GenericName[de_DE]=Feature-basierter parametrischer Modellierer
MimeType=application/x-extension-fcstd; MimeType=application/x-extension-fcstd;

View file

@ -1 +1,6 @@
# Freecad is installed in %%_libdir/freecad:
# this tricks rpmlint in thinking the package is a library one
addFilter("E: library-not-linked-against-libc")
addFilter("E: incoherent-version-in-name")
addFilter("E: invalid-soname.*") addFilter("E: invalid-soname.*")

View file

@ -1,51 +1,57 @@
%define oname FreeCAD
%define oversion 0.15.4664
Summary: FreeCAD is a general purpose 3D CAD modeler Summary: FreeCAD is a general purpose 3D CAD modeler
Name: freecad Name: freecad
Version: 0.14.3702 Version: 0.15
Release: 4 Release: 1
License: GPL and LGPL License: GPLv2+ and LGPLv2+
Group: Graphics Group: Graphics
Url: http://free-cad.sourceforge.net/ Url: http://free-cad.sourceforge.net/
Source0: http://dfn.dl.sourceforge.net/sourceforge/free-cad/freecad-%{version}.tar.gz Source0: http://dfn.dl.sourceforge.net/sourceforge/free-cad/%{oname}-%{version}.tar.gz
Source1: freecad.desktop Source1: %{name}.desktop
Source2: freecad.1 Source2: %{name}.1
Source3: %{name}.rpmlintrc Source3: %{name}.rpmlintrc
# Patch to build with non-backward compatible change in QT4. # Patch to build with non-backward compatible change in QT4.
# Patch1: freecad-0.13-qt4_cmake.patch # Patch1: freecad-0.13-qt4_cmake.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: eigen3 BuildRequires: eigen3 >= 3.0.1
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
BuildRequires: python-matplotlib BuildRequires: python-matplotlib
BuildRequires: boost-devel BuildRequires: boost-devel >= 1.33.1
BuildRequires: opencascade-devel BuildRequires: opencascade-devel >= 5.2
BuildRequires: qt4-devel BuildRequires: qt4-devel
BuildRequires: pkgconfig(SoQt) BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(Coin) BuildRequires: pkgconfig(SoQt) >= 1.2.0
BuildRequires: pkgconfig(Coin) >= 2.4.0
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(ode) BuildRequires: pkgconfig(ode)
BuildRequires: pkgconfig(opencv) BuildRequires: pkgconfig(opencv)
BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(python) >= 2.5
BuildRequires: pkgconfig(shiboken) BuildRequires: pkgconfig(shiboken)
BuildRequires: pkgconfig(pyside) BuildRequires: pkgconfig(pyside)
BuildRequires: pkgconfig(xerces-c) BuildRequires: pkgconfig(xerces-c) >= 2.6
%description %description
FreeCAD will be a general purpose 3D CAD modeler. FreeCAD will be a general purpose parametric 3D CAD modeler. The development
is completely Open Source. It is a feature based parametric modeler with a
The development will be completely Open Source. As with many modern 3D CAD modular software architecture which makes it easy to provide additional
modelers it will have a 2D component in order to extract design detail from functionality without modifying the core system. As with many modern 3D CAD
the 3D model to create 2D production drawings, although 2D (e.g. AutoCAD LT) modelers it has many 2D component in order to extract design detail from
is not the focus, neither are animation and organic shapes (e.g. Maya, the 3D model to create 2D production drawings, but direct 2D drawing (e.g.
3D StudioMAX and Cinema 4D). AutoCAD LT) is not the focus, neither are animation and organic shapes (e.g.
Maya, 3D StudioMAX, Blender and Cinema 4D).
%files %files
%doc ChangeLog.txt copying.lib data/License.txt build/doc/* %doc ChangeLog.txt copying.lib data/License.txt build/doc/*
%{_bindir}/* %{_bindir}/*
%{_libdir}/%{name}/bin/
%{_libdir}/%{name}/Mod/
%{_libdir}/%{name}/*.so
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_libdir}/%{name}/bin/
%{_libdir}/%{name}/lib/
%{_libdir}/%{name}/Mod/
%{_datadir}/%{name}/ %{_datadir}/%{name}/
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
@ -60,52 +66,66 @@ Group: Development/C++
Development files for FreeCAD. Development files for FreeCAD.
%files devel %files devel
%{_libdir}/%{name}/include/* %doc ChangeLog.txt copying.lib
%{_libdir}/%{name}/include/
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%prep %prep
%setup -q %setup -qn %{oname}-%{version}
# %apply_patches #%%apply_patches
# Fix bogus file perms
find ./src -name "*.py*" |xargs chmod 755
find ./src -name "*.h*" |xargs chmod 644
find ./src -name "*.cpp*" |xargs chmod 644
%build %build
%define Werror_cflags %nil #define Werror_cflags %%nil
%cmake_qt4 \ %cmake_qt4 -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
-DCMAKE_INSTALL_INCLUDEDIR=%{_libdir}/%{name}/include \
-DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \ -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DCMAKE_INSTALL_LIBDIR=%{_libdir}/%{name} \
-DRESOURCEDIR=%{_libdir}/freecad -DRESOURCEDIR=%{_libdir}/freecad
%make %make
# -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
%install %install
%makeinstall_std -C build %makeinstall_std -C build
# Symlink binaries to /usr/bin # Symlink binaries to /usr/bin
#mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
#pushd %{buildroot}%{_bindir} pushd %{buildroot}%{_bindir}
#ln -s ../%{_lib}/freecad/bin/FreeCAD . ln -s ../%{_lib}/freecad/bin/FreeCAD .
#ln -s ../%{_lib}/freecad/bin/FreeCADCmd . ln -s ../%{_lib}/freecad/bin/FreeCADCmd .
#popd popd
# Install desktop file # Fix bogus perms
desktop-file-install \ chmod +x %{buildroot}%{_libdir}/%{name}/bin/pivy/sogui.py
--dir=%{buildroot}%{_datadir}/applications %{SOURCE1} chmod +x %{buildroot}%{_libdir}/%{name}/Mod/PartDesign/Scripts/*.py
# Install and fix .desktop file
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
sed -i 's,@lib@,%{_lib},g' %{buildroot}%{_datadir}/applications/%{name}.desktop sed -i 's,@lib@,%{_lib},g' %{buildroot}%{_datadir}/applications/%{name}.desktop
# Install desktop icon # Install desktop icon
install -pD -m 0644 src/Gui/Icons/%{name}.svg \ install -pD -m 0644 src/Gui/Icons/%{name}.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
# Install man page # Install man page
install -pD -m 0644 %{SOURCE2} \ install -pD -m 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/%{name}.1
%{buildroot}%{_mandir}/man1/%{name}.1
# Symlink manpage to other binary names # Symlink manpage to other binary names
pushd %{buildroot}%{_mandir}/man1 pushd %{buildroot}%{_mandir}/man1
ln -sf %{name}.1.gz FreeCAD.1.gz. ln -sf %{name}.1.gz FreeCAD.1.gz.
ln -sf %{name}.1.gz FreeCADCmd.1.gz ln -sf %{name}.1.gz FreeCADCmd.1.gz
popd popd
# FIXME: Apparently there are no more include files to install.
# For now keep the devel package and manually create the needed (empty) dir
mkdir -p %{buildroot}%{_libdir}/%{name}/include