rpms/CGAL/devel .cvsignore, 1.5, 1.6 CGAL.spec, 1.25, 1.26 sources, 1.5, 1.6 CGAL-3.2.1-install_cgal-no_versions_in_compiler_config.h.patch, 1.1, NONE CGAL-3.3-build-library.patch, 1.1, NONE CGAL-install_cgal-SUPPORT_REQUIRED.patch, 1.2, NONE
Laurent Rineau
rineau at fedoraproject.org
Thu Jul 30 14:25:08 UTC 2009
Author: rineau
Update of /cvs/pkgs/rpms/CGAL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27906
Modified Files:
.cvsignore CGAL.spec sources
Removed Files:
CGAL-3.2.1-install_cgal-no_versions_in_compiler_config.h.patch
CGAL-3.3-build-library.patch
CGAL-install_cgal-SUPPORT_REQUIRED.patch
Log Message:
* Thu Jul 30 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.5-0.1.beta1
- Update to CGAL-3.5-beta1.
- New compilation process: CMake.
- No longer any need for patches.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 3 Sep 2007 19:58:59 -0000 1.5
+++ .cvsignore 30 Jul 2009 14:25:07 -0000 1.6
@@ -1 +1 @@
-CGAL-3.3.1.tar.gz
+CGAL-3.5-beta1.tar.gz
Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/CGAL.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- CGAL.spec 24 Jul 2009 15:02:10 -0000 1.25
+++ CGAL.spec 30 Jul 2009 14:25:08 -0000 1.26
@@ -1,34 +1,28 @@
-%define boost_version 1.32
+%define boost_version 1.33
+%define qt_version 4.2
Name: CGAL
-Version: 3.3.1
-Release: 14%{?dist}
+Version: 3.5
+Release: 0.1.beta1%{?dist}
Summary: Computational Geometry Algorithms Library
Group: System Environment/Libraries
License: QPL and LGPLv2 and LGPLv2+
URL: http://www.cgal.org/
-Source0: ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/%{name}-%{version}.tar.gz
+Source0: http://gforge.inria.fr/frs/download.php/22710/CGAL-3.5-beta1.tar.gz
Source10: CGAL-README.Fedora
-Patch1: CGAL-install_cgal-SUPPORT_REQUIRED.patch
-Patch2: CGAL-3.3-build-library.patch
-Patch4: CGAL-3.2.1-install_cgal-no_versions_in_compiler_config.h.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Required devel packages.
+BuildRequires: cmake
BuildRequires: gmp-devel
-BuildRequires: boost-devel >= %boost_version
+BuildRequires: boost-devel >= %{boost_version}
BuildRequires: qt3-devel
+BuildRequires: qt-devel >= %{qt_version}
BuildRequires: zlib-devel
BuildRequires: blas-devel lapack-devel
-%if 0%fedora > 7
BuildRequires: mpfr-devel
-%endif
-
-# CGAL-libs is renamed to CGAL.
-Obsoletes: %{name}-libs < %{version}-%{release}
-Provides: %{name}-libs = %{version}-%{release}
%description
Libraries for CGAL applications.
@@ -42,197 +36,58 @@ access to useful, reliable geometric alg
%package devel
Group: Development/Libraries
Summary: Development files and tools for CGAL applications
+Requires: cmake
Requires: %{name} = %{version}-%{release}
Requires: boost-devel >= %{boost_version}
-Requires: blas-devel lapack-devel qt3-devel zlib-devel gmp-devel
+Requires: qt-devel >= %{qt_version}
+Requires: blas-devel lapack-devel qt3-develzlib-devel gmp-devel
Requires: %{_sysconfdir}/profile.d
-%if 0%fedora > 7
Requires: mpfr-devel
-%endif
%description devel
The %{name}-devel package provides the headers files and tools you may need to
develop applications using CGAL.
%package demos-source
-BuildArch: noarch
Group: Documentation
Summary: Examples and demos of CGAL algorithms
-Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-demo < %{version}-%{release}
-Provides: %{name}-demo = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
%description demos-source
The %{name}-demos-source package provides the sources of examples and demos of
CGAL algorithms.
%prep
-%setup -q
-
-%patch1 -p0 -b .support-required.bak
-%patch2 -p1 -b .build-library.bak
-
-%patch4 -p1 -b .no_versions.bak
+%setup -q -n CGAL-3.5-beta1
-chmod a-x examples/Nef_3/handling_double_coordinates.cin
-
-
-
-# fix end-of-lines of several files
-for f in demo/Straight_skeleton_2/data/vertex_event_9.poly \
- demo/Straight_skeleton_2/data/vertex_event_0.poly \
- examples/Surface_mesh_parameterization/data/mask_cone.off \
- examples/Boolean_set_operations_2/test.dxf;
-do
- if [ -r $f ]; then
- sed -i.bak 's/\r//' $f;
- touch -r ${f}.bak $f
- rm -f ${f}.bak
- fi
-done
+chmod a-x demo/Circular_kernel_2/Circular_kernel_2.qrc
# Install README.Fedora here, to include it in %doc
install -p -m 644 %{SOURCE10} ./README.Fedora
%build
-
-source %{_sysconfdir}/profile.d/qt.sh
-
-./install_cgal -ni g++ --CUSTOM_CXXFLAGS "$RPM_OPT_FLAGS" \
- --without-autofind \
- --with-ZLIB \
- --with-BOOST \
- --with-BOOST_PROGRAM_OPTIONS \
- --with-X11 \
- --with-GMP \
- --with-GMPXX \
- --with-MPFR \
- --with-QT3MT \
- --with-REFBLASSHARED \
- --with-DEFAULTLAPACK \
- --with-OPENGL \
- --disable-static
+mkdir build
+pushd build
+%cmake -DCGAL_INSTALL_LIB_DIR=%{_lib} ..
+make VERBOSE=1 %{?_smp_mflags}
+popd
%install
rm -rf %{buildroot}
-case "%{_arch}" in
- *64* | s390 )
- SUFFIX=64 ;;
- * )
- SUFFIX=32 ;;
-esac
-
-# Install headers
-mkdir -p %{buildroot}%{_includedir}
-cp -a include/* %{buildroot}%{_includedir}
-rm -rf %{buildroot}%{_includedir}/CGAL/config/msvc*
-mv %{buildroot}%{_includedir}/CGAL/config/*/CGAL/compiler_config.h %{buildroot}%{_includedir}/CGAL/compiler_config.h
-# remove the arch-specific comment
-sed -i -e '/System: / d' %{buildroot}%{_includedir}/CGAL/compiler_config.h
-# use the timestamp of install_cgal
-touch -r %{_builddir}/%{name}-%{version}/install_cgal %{buildroot}%{_includedir}/CGAL/compiler_config.h
-rm -rf %{buildroot}%{_includedir}/CGAL/config
-
-# Install scripts (only those prefixed with "cgal_").
-mkdir -p %{buildroot}%{_bindir}
-install -p scripts/cgal_* %{buildroot}%{_bindir}
-
-# Install libraries
-mkdir -p %{buildroot}%{_libdir}
-cp -a lib/*/lib* %{buildroot}%{_libdir}
+pushd build
-# Install makefile:
-mkdir -p %{buildroot}%{_datadir}/CGAL
-touch -r make %{buildroot}%{_datadir}/CGAL
-install -p make/makefile_* %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk
+make install DESTDIR=$RPM_BUILD_ROOT
+
+popd
# Install demos and examples
-mkdir -p %{buildroot}%{_datadir}/CGAL/
+mkdir -p %{buildroot}%{_datadir}/CGAL
touch -r demo %{buildroot}%{_datadir}/CGAL/
cp -a demo %{buildroot}%{_datadir}/CGAL/demo
cp -a examples %{buildroot}%{_datadir}/CGAL/examples
-# Modify makefile
-cat > makefile.sed <<'EOF'
-s,CGAL_INCL_DIR *=.*,CGAL_INCL_DIR = %{_includedir},;
-s,CGAL_LIB_DIR *=.*,CGAL_LIB_DIR = %{_libdir},;
-/CUSTOM_CXXFLAGS/ s/-O2 //;
-/CUSTOM_CXXFLAGS/ s/-g //;
-/CGAL_INCL_DIR/ s,/CGAL/config/.*,,;
-s,/$(CGAL_OS_COMPILER),,g;
-/-I.*CGAL_INCL_CONF_DIR/ d
-EOF
-
-# use -i.bak to generate cgal-${SUFFIX}.mk.bak with right timestamp
-# used below to restore the timestamp
-sed -i.bak -f makefile.sed %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk
-
-# check if the sed script above has worked:
-grep -q %{_builddir} %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-grep -q %{buildroot} %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-grep -q CGAL/config %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-grep -q -E 'CUSTOM_CXXFLAGS.*(-O2|-g)' %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-
-# Remove -L and -R flags from the makefile
-cat > makefile-noprefix.sed <<'EOF'
-/'-L$(CGAL_LIB_DIR)'/ d;
-/-R$(CGAL_LIB_DIR)/ d;
-/'-I$(CGAL_INCL_DIR)'/ d;
-EOF
-
-sed -i -f makefile-noprefix.sed %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk
-
-# restore the timestamp and remove the .bak file
-touch -r %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk.bak %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk
-rm -f %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk.bak
-
-# check that the sed script has worked
-grep -q -E -- '-[LI]\$' %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-grep -q -E -- '-R' %{buildroot}%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-
-
-# Create %{_sysconfdir}/profile.d/ scripts
-cd %{buildroot}
-mkdir -p .%{_sysconfdir}/profile.d
-cat > .%{_sysconfdir}/profile.d/cgal.sh <<EOF
-ARCH=`uname -m`
-
-case \$ARCH in
- x86_64 | ia64 | s390 )
- SUFFIX=64 ;;
- * )
- SUFFIX=32 ;;
-esac
-
-if [ -z "\$CGAL_MAKEFILE" ] ; then
- CGAL_MAKEFILE="%{_datadir}/CGAL/cgal-${SUFFIX}.mk"
- export CGAL_MAKEFILE
-fi
-EOF
-
-cat > .%{_sysconfdir}/profile.d/cgal.csh <<EOF
-set ARCH=`uname -m`
-
-switch( \$ARCH )
- case x86_64:
- case ia64:
- case s390:
- set SUFFIX=64;
- breaksw;
- default:
- set SUFFIX=62;
-endsw
-
-if ( ! \$?CGAL_MAKEFILE ) then
- setenv CGAL_MAKEFILE "%{_datadir}/CGAL/cgal-${SUFFIX}.mk"
-endif
-EOF
-chmod 644 .%{_sysconfdir}/profile.d/cgal.*sh
-# use the timestamp of install_cgal
-touch -r %{_builddir}/%{name}-%{version}/install_cgal .%{_sysconfdir}/profile.d/cgal.*sh
-
%clean
rm -rf %{buildroot}
@@ -245,19 +100,19 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
-%{_libdir}/libCGAL*.so.2
-%{_libdir}/libCGAL*.so.2.0.1
+%{_libdir}/libCGAL*.so.4
+%{_libdir}/libCGAL*.so.4.0.0
%files devel
%defattr(-,root,root,-)
%{_includedir}/CGAL
%{_libdir}/libCGAL*.so
+%{_libdir}/CGAL
%dir %{_datadir}/CGAL
-%{_datadir}/CGAL/cgal*.mk
%{_bindir}/*
%exclude %{_bindir}/cgal_make_macosx_app
-%config(noreplace) %{_sysconfdir}/profile.d/cgal.*
+%{_mandir}/man1/cgal_create_cmake_script.1.gz
%files demos-source
@@ -265,11 +120,14 @@ rm -rf %{buildroot}
%dir %{_datadir}/CGAL
%{_datadir}/CGAL/demo
%{_datadir}/CGAL/examples
-%exclude %{_datadir}/CGAL/*/*/*.vcproj
%exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation
-
%changelog
+* Thu Jul 30 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.5-0.1.beta1
+- Update to CGAL-3.5-beta1.
+- New compilation process: CMake.
+- No longer any need for patches.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -285,48 +143,48 @@ rm -rf %{buildroot}
* Tue Apr 1 2008 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-10
- Rebuild for Rawhide. BR: qt3-devel instead of qt-devel (which is now Qt-4.x).
-* Mon Feb 11 2008 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-9%{dist}
+* Mon Feb 11 2008 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-9
- Rebuild with g++-4.3.
-* Mon Nov 5 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-8%{dist}
+* Mon Nov 5 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-8
- Add Requires: mpfr-devel for CGAL-devel.
-* Mon Oct 22 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-6%{dist}
+* Mon Oct 22 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-6
- fix /etc/profile.d/cgal.*
-* Sun Oct 21 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-3%{dist}
+* Sun Oct 21 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-3
- gawk and coreutils are not required in BR (see exceptions list)
- fix multilib issues (bug #340821):
- rename %%{_datadir}/CGAL/cgal.mk to %%{_datadir}/CGAL/cgal-%%{_arch}.mk
- remove the arch-specific comment from %%{_includedir}/CGAL/compiler_config.h
-* Mon Sep 3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2%{dist}
+* Mon Sep 3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-2
- Fix soversion.
-* Mon Sep 3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1%{dist}
+* Mon Sep 3 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3.1-1
- New upstream bug-fixes release.
-* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-7%{dist}
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-7
- Add BR: mpfr since F-8.
-* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-6%{dist}
+* Fri Aug 24 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-6
- Add BR: gawk
-* Thu Aug 23 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-5%{dist}
+* Thu Aug 23 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 3.3-5
- License: tag fixed.
-* Thu Jun 7 2007 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.3-4%{?dist}
+* Thu Jun 7 2007 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.3-4
- Move the makefile back to %%{_datadir}/CGAL, and rename it cgal.mk (sync
with Debian package). That file is not a config file, but just an example
.mk file that can be copied and adapted by users.
- Fix the %%{_sysconfdir}/profile.d/cgal.* files (the csh one was buggy).
- CGAL-devel now requires all its dependancies.
-* Sat Jun 2 2007 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.3-2%{?dist}
+* Sat Jun 2 2007 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.3-2
- Official CGAL-3.3 release
- Skip file named "skip_vcproj_auto_generation"
-* Wed May 30 2007 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.3-0.1.RC1%{?dist}
+* Wed May 30 2007 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.3-0.1.RC1
- New upstream version: 3.3-RC1
- Obsolete patches CGAL-3.2.1-build-libCGALQt-shared.patch,
CGAL-3.2.1-build-no-static-lib.patch,
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 3 Sep 2007 19:58:59 -0000 1.5
+++ sources 30 Jul 2009 14:25:08 -0000 1.6
@@ -1 +1 @@
-733339b6b05b48d4c7934a6e735b6fc0 CGAL-3.3.1.tar.gz
+15d9fa20689f863d045f8465230923fd CGAL-3.5-beta1.tar.gz
--- CGAL-3.2.1-install_cgal-no_versions_in_compiler_config.h.patch DELETED ---
--- CGAL-3.3-build-library.patch DELETED ---
--- CGAL-install_cgal-SUPPORT_REQUIRED.patch DELETED ---
More information about the fedora-extras-commits
mailing list