diff --git a/.cvsignore b/.cvsignore index 24b9a25..9399ade 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -CGAL-3.2.1.tar.gz +CGAL-3.3-RC1.tar.gz diff --git a/CGAL-3.2.1-build-libCGALQt-shared.patch b/CGAL-3.2.1-build-libCGALQt-shared.patch deleted file mode 100644 index 1b1eecb..0000000 --- a/CGAL-3.2.1-build-libCGALQt-shared.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- CGAL-3.2.1/install_cgal.build.bak 2006-09-11 14:20:12.000000000 +0200 -+++ CGAL-3.2.1/install_cgal 2006-09-11 14:20:49.000000000 +0200 -@@ -4198,7 +4198,7 @@ - if [ -d "${CGAL_SRC_DIR}/CGALQt" -a -n "${PROVIDE_PKG_QT}" ]; then - cd "${CGAL_SRC_DIR}/CGALQt" - _do_compile libCGALQt static -- # _do_compile libCGALQt shared # Not yet ready -+ _do_compile libCGALQt shared # Not yet ready - fi - if [ -d "${CGAL_SRC_DIR}/Core" -a "${PROVIDE_PKG_CORE}" = "CGALCORE" ]; then - cd "${CGAL_SRC_DIR}/Core" ---- CGAL-3.2.1/src/CGALQt/makefile.build.bak 2006-09-11 11:11:25.000000000 +0200 -+++ CGAL-3.2.1/src/CGALQt/makefile 2006-09-11 14:18:49.000000000 +0200 -@@ -27,7 +27,8 @@ - #---------------------------------------------------------------------# - # Choose the right include file from the /make directory. - --# CGAL_MAKEFILE = SHOULD_BE_SET_BY_COMMAND_LINE -+# The following line should better be passed as command line argument. -+# CGAL_MAKEFILE = SHOULD_BE_SET_BY_INSTALL_CGAL - include $(CGAL_MAKEFILE) - - # defaut rule -@@ -46,11 +47,11 @@ - # compiler flags - #---------------------------------------------------------------------# - --# CXXFLAGS must be provided on the make command-line. --# CXXFLAGS = -I"../../include" $(CGAL_WINLIB_CXXFLAGS) -DCGAL_USE_QT -+# CXXFLAGS needs to be passed as command line argument -+# CXXFLAGS = $(CGAL_SHARED_LIB_CXXFLAGS) - - #---------------------------------------------------------------------# --# Object files -+# object files - #---------------------------------------------------------------------# - - CGAL_OBJECTS = \ -@@ -67,7 +68,15 @@ - # target entries - #---------------------------------------------------------------------# - --# TODO : shared_lib ! -+SOVERSION=1.0.1 -+SOMAJOR=1 -+ -+shared_lib: $(CGAL_OBJECTS) -+ $(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR} \ -+ `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ -+ $(CGAL_SHARED_LIB_LDFLAGS) -lGL -+ mv libCGALQt.so.$(SOVERSION) '$(CGAL_LIB_DESTINATION)' -+ rm $(CGAL_OBJECTS) - - static_lib: lib - -@@ -93,10 +102,6 @@ - - include kds_deps.makefile - --#---------------------------------------------------------------------# --# suffix rules --#---------------------------------------------------------------------# -- - Qt_widget$(OBJ_EXT): - $(QT_MOC) $(CGAL_INCL_DIR)/CGAL/IO/Qt_widget.h -o Qt_widget.moc - $(CGAL_CXX) $(CXXFLAGS) -c Qt_widget.cpp -@@ -124,6 +129,10 @@ - $(QT_MOC) $(CGAL_INCL_DIR)/CGAL/IO/Qt_widget_OpenGL.h -o Qt_widget_OpenGL.moc - $(CGAL_CXX) $(CXXFLAGS) -c Qt_widget_OpenGL.cpp - -+#---------------------------------------------------------------------# -+# suffix rules -+#---------------------------------------------------------------------# -+ - .SUFFIXES: .cpp $(SUFFIXES) - - .cpp$(OBJ_EXT): diff --git a/CGAL-3.2.1-build-no-static-lib.patch b/CGAL-3.2.1-build-no-static-lib.patch deleted file mode 100644 index 1e2beb0..0000000 --- a/CGAL-3.2.1-build-no-static-lib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- CGAL-3.2.1/install_cgal.no-static-lib.bak 2006-09-11 14:32:54.000000000 +0200 -+++ CGAL-3.2.1/install_cgal 2006-09-11 14:32:59.000000000 +0200 -@@ -4110,6 +4110,7 @@ - - case "$2" in - static) -+ return 0; - MAKE_OPTION="${MAKE_OPTION} CXXFLAGS=\$(CGAL_LIB_CXXFLAGS) static_lib";; - shared) - MAKE_OPTION="${MAKE_OPTION} CXXFLAGS=\$(CGAL_SHARED_LIB_CXXFLAGS) shared_lib";; diff --git a/CGAL-3.2.1-config.h-endianness_detection.patch b/CGAL-3.2.1-config.h-endianness_detection.patch deleted file mode 100644 index 79db622..0000000 --- a/CGAL-3.2.1-config.h-endianness_detection.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- CGAL-3.2.1/include/CGAL/config.h.orig 2006-07-13 21:01:20.000000000 +0200 -+++ CGAL-3.2.1/include/CGAL/config.h 2006-08-17 15:56:40.000000000 +0200 -@@ -103,12 +103,26 @@ - - // Big endian or little endian machine. - // ==================================== --#ifdef CGAL_CFG_NO_BIG_ENDIAN -+ -+// We used to have a config program for this, but it -+// is much more convenient to use the preprocessor. -+#if defined(__sparc) || defined(__sparc__) \ -+ || defined(_POWER) || defined(__powerpc__) \ -+ || defined(__ppc__) || defined(__hppa) \ -+ || defined(_MIPSEB) || defined(_POWER) \ -+ || defined(__s390__) -+# define CGAL_BIG_ENDIAN -+#elif defined(__i386__) || defined(__alpha__) \ -+ || defined(__x86_64) || defined(__x86_64__) \ -+ || defined(__ia64) || defined(__ia64__) \ -+ || defined(_M_IX86) || defined(_M_IA64) \ -+ || defined(_M_ALPHA) - # define CGAL_LITTLE_ENDIAN - #else --# define CGAL_BIG_ENDIAN -+# error Unknown endianness - #endif - -+ - #ifndef CGAL_USE_LEDA - # define CGAL_USE_CGAL_WINDOW - #endif diff --git a/CGAL-3.3-build-library.patch b/CGAL-3.3-build-library.patch new file mode 100644 index 0000000..24cf2f2 --- /dev/null +++ b/CGAL-3.3-build-library.patch @@ -0,0 +1,95 @@ +--- CGAL-3.3/install_cgal.build-library.bak 2007-05-30 14:05:18.000000000 +0200 ++++ CGAL-3.3/install_cgal 2007-05-30 14:14:10.000000000 +0200 +@@ -937,7 +937,6 @@ + #### settings for sgi mipspro compiler on irix5 + CGAL_SHARED_LIB_CXXFLAGS= + CGAL_SHARED_LIB_LDFLAGS="-lm" +- RUNTIME_LINKER_FLAG="-rpath " + PRINT_STACKTRACE_PROGRAM="dbx" + ;; + *IRIX*6.*CC*7.3*) +@@ -946,14 +945,12 @@ + ADDITIONAL_LDFLAGS="-LANG:std" + CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''" + CGAL_SHARED_LIB_CXXFLAGS= +- RUNTIME_LINKER_FLAG="-rpath " + PRINT_STACKTRACE_PROGRAM="dbx" + ;; + *IRIX*6.*CC*) + #### settings for sgi mipspro compiler on irix6 + CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''" + CGAL_SHARED_LIB_CXXFLAGS= +- RUNTIME_LINKER_FLAG="-rpath " + PRINT_STACKTRACE_PROGRAM="dbx" + ;; + *IRIX*g++*) +@@ -961,7 +958,6 @@ + ADDITIONAL_CXXFLAGS="-Wall" + LONG_NAME_PROBLEM_LDFLAGS="-U -s" + CGAL_SHARED_LIB_LDFLAGS="-lm" +- RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker " + CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" + CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" + CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" +@@ -973,7 +969,6 @@ + CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''" + CGAL_SHARED_LIB_CXXFLAGS="-PIC" + CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G" +- RUNTIME_LINKER_FLAG="-R " + PRINT_STACKTRACE_PROGRAM="dbx" + CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" + CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" +@@ -986,7 +981,6 @@ + LONG_NAME_PROBLEM_CXXFLAGS="-g" + LONG_NAME_PROBLEM_LDFLAGS="-z nodefs -s" + CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G" +- RUNTIME_LINKER_FLAG="-R " + CGAL_SHARED_LIB_SONAME="-h \$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" + CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" + CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" +@@ -995,7 +989,6 @@ + #### settings for g++ on alpha-linux (special FPU handling) + #### LONG_NAME_PROBLEM is cured by disabling debugging + ADDITIONAL_CXXFLAGS="-Wall -mieee -mfp-rounding-mode=d" +- RUNTIME_LINKER_FLAG='-Wl,-R' + CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" + CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" + CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" +@@ -1003,7 +996,6 @@ + *Linux*g++*) + #### settings for g++ on linux + ADDITIONAL_CXXFLAGS="-Wall" +- RUNTIME_LINKER_FLAG='-Wl,-R' + CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" + CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" + CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" +@@ -1013,12 +1005,10 @@ + # -mp is required for correct enough floating point operations + # necessary for interval arithmetic. + ADDITIONAL_CXXFLAGS="-mp" +- RUNTIME_LINKER_FLAG='-Wl,-R' + PRINT_STACKTRACE_PROGRAM="idb" + ;; + *Linux*pgCC*|*Linux*pgcpp*) + #### settings for Portland Group Compiler on linux +- RUNTIME_LINKER_FLAG='-Wl,-R' + # PGCC has long name problems with "-g". + DEBUG_OPT="" + ;; +@@ -1029,7 +1019,6 @@ + CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''" + CGAL_SHARED_LIB_CXXFLAGS="-PIC" + CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G" +- RUNTIME_LINKER_FLAG="-R " + PRINT_STACKTRACE_PROGRAM="dbx" + CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" + CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" +@@ -4335,7 +4319,7 @@ + _buildlog_marker="log for $1 $2 shown" + + ${_printf} "%s %s\n" "${MAKE}" "${MAKE_OPTION}" > "${COMPILE_LOGFILE}" +- if ${MAKE} ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then ++ if ${MAKE} ${MAKE_OPTION} | tee "${COMPILE_LOGFILE}" 2>&1; then + log_print "Compilation of $1 $2 ${_libname} succeeded." + log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv" + eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION} diff --git a/CGAL-build-library.dpatch b/CGAL-build-library.dpatch deleted file mode 100644 index ffbc32e..0000000 --- a/CGAL-build-library.dpatch +++ /dev/null @@ -1,56 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## library-soname.dpatch by Joachim Reichel -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad cgal/install_cgal cgal/install_cgal ---- cgal/install_cgal 2006-04-17 22:33:03.000000000 +0200 -+++ cgal/install_cgal 2006-04-17 22:33:06.000000000 +0200 -@@ -4156,7 +4156,7 @@ - MAKE_OPTION="${MAKE_OPTION} CXXFLAGS=\$(CGAL_SHARED_LIB_CXXFLAGS) shared_lib";; - esac - -- if make ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then -+ if make ${MAKE_OPTION} | tee "${COMPILE_LOGFILE}" 2>&1; then - log_print "Compilation of $1 $2 ${_libname} succeeded." - ${_printf} "%s\n" " done." - ANY_LIB_COMPILED='y' -diff -urNad cgal/src/CGAL/makefile cgal/src/CGAL/makefile ---- cgal/src/CGAL/makefile 2006-04-17 22:33:03.000000000 +0200 -+++ cgal/src/CGAL/makefile 2006-04-17 22:33:28.000000000 +0200 -@@ -74,11 +74,14 @@ - # target entries - #---------------------------------------------------------------------# - -+SOVERSION=1.0.1 -+SOMAJOR=1 -+ - shared_lib: $(CGAL_OBJECTS) -- $(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB) \ -+ $(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB).$(SOVERSION) -Wl,-soname,$(CGAL_SHARED_LIB).${SOMAJOR} \ - `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ - $(CGAL_SHARED_LIB_LDFLAGS) -- mv $(CGAL_SHARED_LIB) '$(CGAL_LIB_DESTINATION)' -+ mv $(CGAL_SHARED_LIB).$(SOVERSION) '$(CGAL_LIB_DESTINATION)' - rm $(CGAL_OBJECTS) - - static_lib: static_lib_no_install -@@ -99,5 +102,5 @@ - #---------------------------------------------------------------------# - - .cpp$(OBJ_EXT): -- $(CGAL_CXX) $(CXXFLAGS) -c $< -+ $(CGAL_CXX) $(CXXFLAGS) -D_REENTRANT -c $< - -diff -urNad cgal/src/CGALQt/makefile cgal/src/CGALQt/makefile ---- cgal/src/CGALQt/makefile 2006-04-17 21:00:25.000000000 +0200 -+++ cgal/src/CGALQt/makefile 2006-04-17 22:33:53.000000000 +0200 -@@ -125,5 +125,5 @@ - $(CGAL_CXX) $(CXXFLAGS) -c Qt_widget_OpenGL.cpp - - .cpp$(OBJ_EXT): -- $(CGAL_CXX) $(CXXFLAGS) -c $< -+ $(CGAL_CXX) $(CXXFLAGS) -D_REENTRANT -c $< - diff --git a/CGAL.spec b/CGAL.spec index d1129d4..6ca4899 100644 --- a/CGAL.spec +++ b/CGAL.spec @@ -1,21 +1,18 @@ %define boost_version 1.32 Name: CGAL -Version: 3.2.1 -Release: 19%{?dist} +Version: 3.3 +Release: 0.1.RC1%{?dist} Summary: Computational Geometry Algorithms Library Group: System Environment/Libraries License: QPL/LGPL URL: http://www.cgal.org/ -Source0: ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/%{name}-%{version}.tar.gz +Source0: ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/%{name}-%{version}-RC1.tar.gz Source10: CGAL-README.Fedora Patch1: CGAL-install_cgal-SUPPORT_REQUIRED.patch -Patch2: CGAL-build-library.dpatch -Patch3: CGAL-3.2.1-config.h-endianness_detection.patch +Patch2: CGAL-3.3-build-library.patch Patch4: CGAL-3.2.1-install_cgal-no_versions_in_compiler_config.h.patch -Patch5: CGAL-3.2.1-build-libCGALQt-shared.patch -Patch6: CGAL-3.2.1-build-no-static-lib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,6 +22,10 @@ BuildRequires: boost-devel >= %boost_version BuildRequires: qt-devel >= 3.0 BuildConflicts:qt-devel < 4 BuildRequires: zlib-devel +BuildRequires: blas-devel lapack-devel + +# for chmod in prep: +BuildRequires: coreutils # CGAL-libs is renamed to CGAL. Obsoletes: %{name}-libs < %{version}-%{release} @@ -44,7 +45,7 @@ Group: Development/Libraries Summary: Development files and tools for CGAL applications Requires: %{name} = %{version}-%{release} Requires: boost-devel >= %{boost_version} -Requires: /etc/profile.d +Requires: %{_sysconfdir}/profile.d %description devel The %{name}-devel package provides the headers files and tools you may need to develop applications using CGAL. @@ -65,17 +66,12 @@ CGAL algorithms. %setup -q %patch1 -p0 -b .support-required.bak -%patch2 -p1 -b .debian.build-library.bak - -# no hard-coded endianness: remove a test file, and use an upstream patch -rm config/testfiles/CGAL_CFG_NO_BIG_ENDIAN.C -%patch3 -p1 -b .endianness-detection.bak +%patch2 -p1 -b .build-library.bak %patch4 -p1 -b .no_versions.bak -%patch5 -p1 -b .build-qt-library.bak +chmod a-x examples/Nef_3/handling_double_coordinates.cin -%patch6 -p1 -b .no-static-lib.bak # fix end-of-lines of several files @@ -92,23 +88,24 @@ done # Install README.Fedora here, to include it in %doc install -m 644 %{SOURCE10} ./README.Fedora -# Move LICENSE.OPENNL, to include it in %doc -mv include/OpenNL/LICENSE.OPENNL . - %build -source /etc/profile.d/qt.sh +source %{_sysconfdir}/profile.d/qt.sh ./install_cgal -ni g++ --CUSTOM_CXXFLAGS "$RPM_OPT_FLAGS" \ --without-autofind \ --with-ZLIB \ --with-BOOST \ - --with-BOOSTPROGRAMOPTIONS \ + --with-BOOST_PROGRAM_OPTIONS \ --with-X11 \ --with-GMP \ --with-GMPXX \ --with-MPFR \ - --with-QT3MT + --with-QT3MT \ + --with-REFBLASSHARED \ + --with-LAPACK \ + --with-OPENGL \ + --disable-static %install @@ -117,7 +114,7 @@ rm -rf %{buildroot} # Install headers mkdir -p %{buildroot}%{_includedir} cp -a include/* %{buildroot}%{_includedir} -rm -rf %{buildroot}%{_includedir}/CGAL/config/msvc7 +rm -rf %{buildroot}%{_includedir}/CGAL/config/msvc* mv %{buildroot}%{_includedir}/CGAL/config/*/CGAL/compiler_config.h %{buildroot}%{_includedir}/CGAL/ rm -rf %{buildroot}%{_includedir}/CGAL/config @@ -128,16 +125,15 @@ cp -a scripts/cgal_* %{buildroot}%{_bindir} # Install libraries mkdir -p %{buildroot}%{_libdir} cp -a lib/*/lib* %{buildroot}%{_libdir} -ln -s libCGAL.so.1.0.1 %{buildroot}%{_libdir}/libCGAL.so -ln -s libCGAL.so.1.0.1 %{buildroot}%{_libdir}/libCGAL.so.1 -ln -s libCGALQt.so.1.0.1 %{buildroot}%{_libdir}/libCGALQt.so -ln -s libCGALQt.so.1.0.1 %{buildroot}%{_libdir}/libCGALQt.so.1 # Install makefile: -mkdir -p %{buildroot}%{_datadir}/CGAL/make -cp -p make/makefile_* %{buildroot}%{_datadir}/CGAL/make/makefile +mkdir -p %{buildroot}%{_sysconfdir}/CGAL +touch -r make %{buildroot}%{_sysconfdir}/CGAL +cp -p make/makefile_* %{buildroot}%{_sysconfdir}/CGAL/makefile # Install demos and examples +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 @@ -152,13 +148,13 @@ s,/$(CGAL_OS_COMPILER),,g; /-I.*CGAL_INCL_CONF_DIR/ d EOF -sed -i -f makefile.sed %{buildroot}%{_datadir}/CGAL/make/makefile +sed -i -f makefile.sed %{buildroot}%{_sysconfdir}/CGAL/makefile # check if the sed script above has worked: -grep -q %{_builddir} %{buildroot}%{_datadir}/CGAL/make/makefile && false -grep -q %{buildroot} %{buildroot}%{_datadir}/CGAL/make/makefile && false -grep -q CGAL/config %{buildroot}%{_datadir}/CGAL/make/makefile && false -grep -q -E 'CUSTOM_CXXFLAGS.*(-O2|-g)' %{buildroot}%{_datadir}/CGAL/make/makefile && false +grep -q %{_builddir} %{buildroot}%{_sysconfdir}/CGAL/makefile && false +grep -q %{buildroot} %{buildroot}%{_sysconfdir}/CGAL/makefile && false +grep -q CGAL/config %{buildroot}%{_sysconfdir}/CGAL/makefile && false +grep -q -E 'CUSTOM_CXXFLAGS.*(-O2|-g)' %{buildroot}%{_sysconfdir}/CGAL/makefile && false # Remove -L and -R flags from the makefile cat > makefile-noprefix.sed <<'EOF' @@ -167,30 +163,30 @@ cat > makefile-noprefix.sed <<'EOF' /'-I$(CGAL_INCL_DIR)'/ d; EOF -sed -i -f makefile-noprefix.sed %{buildroot}%{_datadir}/CGAL/make/makefile +sed -i -f makefile-noprefix.sed %{buildroot}%{_sysconfdir}/CGAL/makefile # check that the sed script has worked -grep -q -E -- '-[LI]\$' %{buildroot}%{_datadir}/CGAL/make/makefile && false -grep -q -E -- '-R' %{buildroot}%{_datadir}/CGAL/make/makefile && false +grep -q -E -- '-[LI]\$' %{buildroot}%{_sysconfdir}/CGAL/makefile && false +grep -q -E -- '-R' %{buildroot}%{_sysconfdir}/CGAL/makefile && false -# Create /etc/profile.d/ scripts +# Create %{_sysconfdir}/profile.d/ scripts cd %{buildroot} -mkdir -p ./etc/profile.d -cat > ./etc/profile.d/cgal.sh < .%{_sysconfdir}/profile.d/cgal.sh < ./etc/profile.d/cgal.csh < .%{_sysconfdir}/profile.d/cgal.csh < - 3.3-0.1.RC1%{?dist} +- 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, + CGAL-3.2.1-config.h-endianness_detection.patch. + These patchs have been merged and adapted by upstream. +- New option --disable-static +- Shipped OpenNL and CORE have been renamed by upstream: + - %%{_includedir}/OpenNL is now %{_includedir}/CGAL/OpenNL + - %%{_includedir}/CORE is now %{_includedir}/CGAL/CORE + - libCORE has been rename libCGALcore++ + Reasons: + - CGAL/OpenNL is a special version of OpenNL, rewritten for CGAL + in C++ by the OpenNL author, + - CGAL/CORE is a fork of CORE-1.7. CORE-1.7 is no longer maintained by + its authors, and CORE-2.0 is awaited since 2004. + In previous releases of this package, CORE was excluded from the package, + because %%{_includedir}/CORE/ was a name too generic (see comment #8 of + #bug #199168). Since the headers of CORE have been moved to + %%{_includedir}/CGAL/CORE, CORE is now shipped with CGAL. +- move %%{_datadir}/CGAL/make/makefile to %%{_sysconfdir}/CGAL/makefile +(because it is a config file). + * Thu Nov 2 2006 Laurent Rineau - 3.2.1-19 - Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675) * Fri Sep 15 2006 Laurent Rineau - 3.2.1-18 -- Move LICENSE.OPENNL to %doc CGAL-devel (bug #206575). +- Move LICENSE.OPENNL to %%doc CGAL-devel (bug #206575). * Mon Sep 11 2006 Laurent Rineau - 3.2.1-17 - libCGALQt.so needs -lGL -- remove %{_bindir}/cgal_make_macosx_app +- remove %%{_bindir}/cgal_make_macosx_app * Sat Sep 11 2006 Laurent Rineau - 3.2.1-16 - Remove CORE support. Its acceptance in Fedora is controversial (bug #199168). @@ -252,7 +265,7 @@ rm -rf %{buildroot} - Fixed the License: tag. * Thu Aug 17 2006 Laurent Rineau - 3.2.1-15 -- Change the permissions of /etc/profile.d/cgal.*sh +- Change the permissions of %%{_sysconfdir}/profile.d/cgal.*sh - Remove the meta package CGAL. CGAL-libs is renamed CGAL. - Added two patchs: - CGAL-3.2.1-config.h-endianness_detection.patch which is an upstream patch @@ -303,7 +316,7 @@ tarball. * Sat Jul 1 2006 Laurent Rineau - 3.2-3 - Use less "*" in %%files, to avoid futur surprises. -- Remove /etc/profile.d/cgal.* from %%files if %%cgal_prefix is not empty. +- Remove %%{_sysconfdir}/profile.d/cgal.* from %%files if %%cgal_prefix is not empty. - Fix %%build_doc=0 when %%fedora is set. New option macro: %%force_build_doc. * Fri Jun 30 2006 Laurent Rineau - 3.2-2 diff --git a/sources b/sources index 82697b2..a19a52a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82c98d44aa88d1154631f266e85d3b35 CGAL-3.2.1.tar.gz +bd0554f3e350e25a7cbaa2f91bee1c3e CGAL-3.3-RC1.tar.gz