Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2017-11-09 16:27:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "FreeCAD" Thu Nov 9 16:27:38 2017 rev:3 rq:540131 version:0.16.6712 Changes: -------- --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2017-10-18 10:50:43.200203450 +0200 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new/FreeCAD.changes 2017-11-09 16:28:14.738313815 +0100 @@ -1,0 +2,6 @@ +Wed Nov 8 08:09:39 UTC 2017 - [email protected] + +- Update to 0.16.6712 (contains backports from trunk) +- Some cleanup + +------------------------------------------------------------------- Old: ---- FreeCAD-0.16.tar.xz New: ---- FreeCAD-0.16.6712.obscpio FreeCAD.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeCAD.spec ++++++ --- /var/tmp/diff_new_pack.kXbLXd/_old 2017-11-09 16:28:29.333779557 +0100 +++ /var/tmp/diff_new_pack.kXbLXd/_new 2017-11-09 16:28:29.337779411 +0100 @@ -19,65 +19,58 @@ %define x_prefix %{_libdir}/%{name} Name: FreeCAD -Version: 0.16 +Version: 0.16.6712 Release: 0 Summary: General Purpose 3D CAD Modeler License: LGPL-2.0+ and GPL-2.0+ Group: Productivity/Graphics/CAD Url: http://www.freecadweb.org/ -Source0: %{name}-%version.tar.xz +Source0: %{name}-%{version}.tar.xz Source2: FreeCAD_shared_mimeinfo BuildRequires: Coin-devel BuildRequires: SoQt-devel -BuildRequires: oce-devel %if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 -# Leap has it's own special boost-devel +# Leap has its own special boost-devel BuildRequires: boost_1_58_0-devel %else BuildRequires: boost-devel >= 1.55 %endif BuildRequires: cmake +BuildRequires: dos2unix BuildRequires: doxygen BuildRequires: f2c BuildRequires: fdupes BuildRequires: freeglut-devel BuildRequires: gcc-fortran +BuildRequires: git +BuildRequires: hdf5-devel BuildRequires: libXerces-c-devel -BuildRequires: pkg-config -BuildRequires: pkgconfig(QtWebKit) -%if 0%{?suse_version} > 0 BuildRequires: libeigen3-devel -BuildRequires: python-xml -%endif -%if 0%{?fedora} > 18 -BuildRequires: eigen3-devel -%endif BuildRequires: libqt4-devel +BuildRequires: libshiboken-devel BuildRequires: libspnav-devel +BuildRequires: oce-devel BuildRequires: opencv-devel +BuildRequires: pkgconfig BuildRequires: python-CXX-devel BuildRequires: python-devel BuildRequires: python-matplotlib -BuildRequires: swig -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif -BuildRequires: dos2unix -BuildRequires: git -BuildRequires: hdf5-devel -BuildRequires: libshiboken-devel -BuildRequires: make BuildRequires: python-pyside BuildRequires: python-pyside-devel BuildRequires: python-pyside-tools +BuildRequires: python-xml +BuildRequires: swig BuildRequires: unzip +BuildRequires: update-desktop-files BuildRequires: zlib-devel +BuildRequires: pkgconfig(QtWebKit) Requires: python-CXX Requires: python-pyside +%if 0%{?suse_version} <= 1320 Requires(post): shared-mime-info Requires(postun): shared-mime-info +%endif Recommends: python-pivy -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Note: This package contains the current development version and thus might @@ -112,6 +105,11 @@ rm src/3rdparty/Pivy -fr rm src/3rdparty/Pivy-0.5 -fr +# fix env-script-interpreter +sed -i '1c#!%{__python2}' \ + src/Mod/Test/testmakeWireString.py \ + src/Mod/Test/unittestgui.py + %build mkdir build && cd build # cmake macro would set standard libdir @@ -139,17 +137,17 @@ # mkdir build_doc # pushd build_doc # cmake \ -# -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -# -DLIB_SUFFIX=%{_lib} \ -# -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \ -# -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \ -# -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/%{name} \ +# -DCMAKE_INSTALL_PREFIX=%%{_prefix} \ +# -DLIB_SUFFIX=%%{_lib} \ +# -DCMAKE_INSTALL_DATADIR=%%{_datadir}/%%{name} \ +# -DCMAKE_INSTALL_DOCDIR=%%{_docdir}/%%{name} \ +# -DCMAKE_INSTALL_INCLUDEDIR=%%{_includedir}/%%{name} \ # -DCMAKE_BUILD_TYPE=Release \ # -DFREECAD_USE_EXTERNAL_ZIPIOS=TRUE \ # -DFREECAD_USE_EXTERNAL_PIVY=TRUE \ # ../ # # Needs an updated opencascade -# #-DOCE_DIR=/opt/OpenCASCADE/%{_lib} +# #-DOCE_DIR=/opt/OpenCASCADE/%%{_lib} # # nice make VERBOSE=1 DevDoc # popd @@ -160,38 +158,38 @@ popd # pushd build_doc -# nice make VERBOSE=1 %{?_smp_mflags} install DESTDIR=%{buildroot} +# nice make VERBOSE=1 %%{?_smp_mflags} install DESTDIR=%%{buildroot} # popd # Install the Qt plugin -#install -Dpm 0755 src/Tools/plugins/widget/libFreeCAD_widgets.so %{buildroot}/usr/%{_lib}/qt4/plugins/designer/libFreeCAD_widgets.so +#install -Dpm 0755 src/Tools/plugins/widget/libFreeCAD_widgets.so %%{buildroot}/usr/%%{_lib}/qt4/plugins/designer/libFreeCAD_widgets.so # Fix "non-executable-script" rpmlint warning -chmod 755 %{buildroot}%{x_prefix}/Mod/Robot/MovieTool.py +chmod 755 %{buildroot}%{x_prefix}/Mod/Robot/MovieTool.py \ + %{buildroot}%{x_prefix}/Mod/Test/testmakeWireString.py \ + %{buildroot}%{x_prefix}/Mod/Test/unittestgui.py # Move desktop icon in the correct location -mkdir -p %{buildroot}/usr/share/pixmaps -mv %{buildroot}%{_datadir}/%{name}/freecad.xpm %{buildroot}/usr/share/pixmaps/freecad.xpm +mkdir -p %{buildroot}%{_datadir}/pixmaps +mv %{buildroot}%{_datadir}/%{name}/freecad.xpm %{buildroot}%{_datadir}/pixmaps/freecad.xpm # Install additional documentation files install -pm 0644 ChangeLog.txt copying.lib %{buildroot}%{_docdir}/%{name}/ -%if 0%{?suse_version} %suse_update_desktop_file -c %{name} "%{name}" "3D CAD Modeler" %{name} "freecad" Education Engineering -%endif # Install mime type -install -Dpm 0644 %{SOURCE2} %{buildroot}/usr/share/mime/packages/%{name}.xml +install -Dpm 0644 %{SOURCE2} %{buildroot}/%{_datadir}/mime/packages/%{name}.xml # Remove unneeded files -find %{buildroot} -name '*.la' -exec rm -f {} ';' +find %{buildroot} -type f -name "*.la" -delete -print # Fix rpmlint warning "doc-file-dependency" rm -f html/installdox # Install development documentation manually in order to fix rpmlint warning "files-duplicate" mkdir -p %{buildroot}%{_docdir}/%{name}-devel -#cp -a html/ %{buildroot}%{_docdir}/%{name}-devel/ +#cp -a html/ %%{buildroot}%%{_docdir}/%%{name}-devel/ # Correct line endings dos2unix %{buildroot}%{x_prefix}/Mod/PartDesign/Scripts/FilletArc.py @@ -200,30 +198,27 @@ dos2unix %{buildroot}%{x_prefix}/Mod/Part/MakeBottle.py # Link binaries -mkdir -p %{buildroot}/usr/bin -ln -s -t %{buildroot}/usr/bin %{x_prefix}/bin/FreeCAD -ln -s -t %{buildroot}/usr/bin %{x_prefix}/bin/FreeCADCmd +mkdir -p %{buildroot}%{_bindir} +ln -s -t %{buildroot}%{_bindir} %{x_prefix}/bin/FreeCAD +ln -s -t %{buildroot}%{_bindir} %{x_prefix}/bin/FreeCADCmd %fdupes -s %{buildroot} %post /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +%mime_database_post %postun /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +%mime_database_postun %files -%defattr(-,root,root,-) %{_bindir}/FreeCAD* %doc %{_docdir}/%{name}/ %{_libdir}/%{name} %{_datadir}/%{name}/ %{_datadir}/mime/packages/%{name}.xml %{_datadir}/pixmaps/freecad.xpm -%if 0%{?suse_version} > 0 %{_datadir}/applications/%{name}.desktop -%endif %changelog ++++++ FreeCAD.obsinfo ++++++ name: FreeCAD version: 0.16.6712 mtime: 1500312467 commit: da2d364457257a7a8c6fb2137cea12c45becd71a ++++++ _service ++++++ --- /var/tmp/diff_new_pack.kXbLXd/_old 2017-11-09 16:28:29.417776482 +0100 +++ /var/tmp/diff_new_pack.kXbLXd/_new 2017-11-09 16:28:29.417776482 +0100 @@ -1,13 +1,15 @@ <services> - <service name="tar_scm" mode="disabled"> + <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/FreeCAD/FreeCAD.git</param> <param name="scm">git</param> - <param name="revision">0.16</param> - <param name="version">0.16</param> + <param name="revision">releases/FreeCAD-0-16</param> + <param name="version">0.16.6712</param> </service> - <service name="recompress" mode="disabled"> + <service name="set_version" mode="disabled"/> + + <service name="tar" mode="buildtime"/> + <service name="recompress" mode="buildtime"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> - <service name="set_version" mode="disabled"/> </services>
