Hello community, here is the log from the commit of package cgal for openSUSE:Factory checked in at 2015-03-03 11:14:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cgal (Old) and /work/SRC/openSUSE:Factory/.cgal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cgal" Changes: -------- --- /work/SRC/openSUSE:Factory/cgal/cgal.changes 2014-12-30 00:50:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cgal.new/cgal.changes 2015-03-03 11:14:57.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Feb 28 22:13:24 UTC 2015 - [email protected] + +- Remove conditionals and use only cmake macros for building + +------------------------------------------------------------------- +Sat Feb 28 08:51:44 UTC 2015 - [email protected] + +- Cleanup spec file with spec-cleaner +- Remove sha256sum.txt +- Update to 4.5.2 + * Fix a bug that prevented the compilation with recent versions + of Boost (>=1.56) when explicit conversions operators + (from C++11) are supported. That prevented the compilation with + Microsoft Visual Studio 2013. + * 3D Convex Hulls: Fix a non-robust predicate bug that was + showing up when input points where lexicographically sorted. + * 3D Mesh Generation: Fix a bug in the sliver perturbation + optimization method. It could create some holes on the + surface of the mesh. + +------------------------------------------------------------------- Old: ---- CGAL-4.5.1-doc_html.tar.xz CGAL-4.5.1.tar.xz sha256sum.txt New: ---- CGAL-4.5.2-doc_html.tar.xz CGAL-4.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cgal.spec ++++++ --- /var/tmp/diff_new_pack.RJu3Bz/_old 2015-03-03 11:14:58.000000000 +0100 +++ /var/tmp/diff_new_pack.RJu3Bz/_new 2015-03-03 11:14:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cgal # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 Ioda-Net Sàrl, Charmoille, Switzerland. # # All modifications and additions to the file contributed by third parties @@ -22,32 +22,29 @@ #@TODO : split package in coherent parts #@TODO : rename parts (inspirated by sfcgal packaging) #@TODO : ask for rename and take into account the obsolete existant thing. like libcgal deps - %define _soname 10 %define _soversion 10.0.4 %define _sourcename CGAL %define _libname libCGAL%{_soname} - Name: cgal -Version: 4.5.1 +Version: 4.5.2 Release: 0 Summary: Computational Geometry Algorithms Library License: GPL-3.0+ and LGPL-3.0+ Group: Productivity/Graphics/CAD Url: http://www.cgal.org/ -# Keep this stable link latestfile and 2743=CGAL no form fill-up needed # You will need to update the magic numbers from the download urls on updating -Source0: https://gforge.inria.fr/frs/download.php/file/34402/%{_sourcename}-%{version}.tar.xz -Source1: https://gforge.inria.fr/frs/download.php/file/34407/%{_sourcename}-%{version}-doc_html.tar.xz +Source0: https://gforge.inria.fr/frs/download.php/file/34513/%{_sourcename}-%{version}.tar.xz +Source1: https://gforge.inria.fr/frs/download.php/file/34513/%{_sourcename}-%{version}-doc_html.tar.xz Source2: cgal-rpmlintrc -Source3: https://gforge.inria.fr/frs/download.php/file/34404/sha256sum.txt -BuildRequires: blas +BuildRequires: blas-devel BuildRequires: boost-devel >= 1.39 BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: glu-devel BuildRequires: gmp-devel -BuildRequires: lapack +BuildRequires: lapack-devel BuildRequires: libqt4-devel BuildRequires: mpfr-devel BuildRequires: xz @@ -106,9 +103,7 @@ License: GPL-3.0+ and LGPL-3.0+ and BSL-1.0 and MIT Group: Development/Libraries Requires: %{name}-devel = %{version} -%if 0%{?suse_version} >= 1210 BuildArch: noarch -%endif %description demo-examples-devel This package provides the sources of examples and demos of @@ -119,38 +114,24 @@ Summary: Documentation CGAL algorithms License: GPL-3.0+ and LGPL-3.0+ Group: Documentation/HTML -%if 0%{?suse_version} >= 1210 BuildArch: noarch -%endif %description doc This package provides the documentation for CGAL algorithms. %prep %setup -q -n CGAL-%{version} -tar -xJf %{S:1} +tar -xJf %{SOURCE1} %build -%if 0%{?suse_version} >= 1310 -# Make things more secure, but only on new version - export LDFLAGS="-Wl,-z,relro,-z,now -pie" - export CFLAGS="%{optflags} -fPIE -pie" - export CXXFLAGS="%{optflags} -fPIE -pie" - %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +export LDFLAGS="-Wl,-z,relro,-z,now -pie" +export CFLAGS="%{optflags} -fPIE -pie" +export CXXFLAGS="%{optflags} -fPIE -pie" +%cmake \ -DCGAL_INSTALL_LIB_DIR=%{_lib} \ -DCMAKE_BUILD_TYPE=Release \ - .. - make VERBOSE=1 %{?_smp_mflags} -%else - mkdir build - pushd build - cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCGAL_INSTALL_LIB_DIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=Release \ - .. - make VERBOSE=1 %{?_smp_mflags} - popd -%endif + +make %{?_smp_mflags} # Unfortunately take +6600sec locally. # So we just deliver the source code in cgal package. @@ -158,12 +139,7 @@ # -DWITH_demos=true \ %install -pushd build -make VERBOSE=1 DESTDIR=%{buildroot} %{?_smp_mflags} install -# We don't build them so source install is made by hand -# make VERBOSE=1 DESTDIR=%%{buildroot} %%{?_smp_mflags} demos -# make VERBOSE=1 DESTDIR=%%{buildroot} %%{?_smp_mflags} examples -popd +%cmake_install install -d %{buildroot}/%{_datadir}/CGAL/examples install -d %{buildroot}/%{_datadir}/CGAL/demo @@ -176,10 +152,8 @@ # no macos here. rm %{buildroot}/%{_bindir}/cgal_make_macosx_app -%if 0%{?suse_version} %fdupes doc_html %fdupes %{buildroot}/%{_datadir} -%endif %post -n %{_libname} -p /sbin/ldconfig ++++++ CGAL-4.5.1-doc_html.tar.xz -> CGAL-4.5.2-doc_html.tar.xz ++++++ /work/SRC/openSUSE:Factory/cgal/CGAL-4.5.1-doc_html.tar.xz /work/SRC/openSUSE:Factory/.cgal.new/CGAL-4.5.2-doc_html.tar.xz differ: char 25, line 1 ++++++ CGAL-4.5.1-doc_html.tar.xz -> CGAL-4.5.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/cgal/CGAL-4.5.1-doc_html.tar.xz /work/SRC/openSUSE:Factory/.cgal.new/CGAL-4.5.2.tar.xz differ: char 25, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
