rpms/CGAL/devel CGAL-3.2.1-build-libCGALQt-shared.patch, NONE, 1.1 CGAL-3.2.1-build-no-static-lib.patch, NONE, 1.1 CGAL-README.Fedora, 1.1, 1.2 CGAL-install_cgal-SUPPORT_REQUIRED.patch, 1.1, 1.2 CGAL.spec, 1.1, 1.2
Laurent Rineau (rineau)
fedora-extras-commits at redhat.com
Mon Sep 11 13:27:07 UTC 2006
Author: rineau
Update of /cvs/extras/rpms/CGAL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17087
Modified Files:
CGAL-README.Fedora CGAL-install_cgal-SUPPORT_REQUIRED.patch
CGAL.spec
Added Files:
CGAL-3.2.1-build-libCGALQt-shared.patch
CGAL-3.2.1-build-no-static-lib.patch
Log Message:
* Mon Sep 11 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.2.1-17
- libCGALQt.so needs -lGL
- remove %{_bindir}/cgal_make_macosx_app
* Sat Sep 11 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.2.1-16
- Remove CORE support. Its acceptance in Fedora is controversial (bug #199168).
- Exclude .vcproj files from the -demos-source subpackage.
- Added a patch to build *shared* library libCGALQt.
- Added a patch to avoid building static libraries.
- Fixed the License: tag.
CGAL-3.2.1-build-libCGALQt-shared.patch:
--- NEW FILE CGAL-3.2.1-build-libCGALQt-shared.patch ---
--- 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 <cgalroot>/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):
CGAL-3.2.1-build-no-static-lib.patch:
--- NEW FILE CGAL-3.2.1-build-no-static-lib.patch ---
--- 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";;
Index: CGAL-README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/CGAL/devel/CGAL-README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CGAL-README.Fedora 11 Sep 2006 09:34:00 -0000 1.1
+++ CGAL-README.Fedora 11 Sep 2006 13:27:07 -0000 1.2
@@ -8,19 +8,15 @@
--------
In Fedora, the CGAL tarball is separated in several packages:
- - CGAL-libs contains the shared libraries,
- - CGAL-devel contains header files, static libraries, and several files
- and tools needed to develop CGAL applications,
+ - CGAL contains the shared libraries,
+ - CGAL-devel contains header files, and several files and tools needed to
+ develop CGAL applications,
- CGAL-demos-source contains the source of examples and demos of CGAL.
-The CGAL meta-package permits to install all CGAL at once.
-
Documentation
-------------
Note that the CGAL documentation cannot be packaged for Fedora due to unclear
-license conditions. In fact, the upstream tarball of CGAL contains the
-installation instructions as PDF. Therefore, this document had to be removed
-from the Fedora package. The complete documentation in PDF and HTML is
-available at http://www.cgal.org/.
+license conditions. The complete documentation in PDF and HTML is
+available at http://www.cgal.org/Manual/index.html
CGAL-install_cgal-SUPPORT_REQUIRED.patch:
Index: CGAL-install_cgal-SUPPORT_REQUIRED.patch
===================================================================
RCS file: /cvs/extras/rpms/CGAL/devel/CGAL-install_cgal-SUPPORT_REQUIRED.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CGAL-install_cgal-SUPPORT_REQUIRED.patch 11 Sep 2006 09:34:00 -0000 1.1
+++ CGAL-install_cgal-SUPPORT_REQUIRED.patch 11 Sep 2006 13:27:07 -0000 1.2
@@ -7,7 +7,7 @@
# ---------------------------------------------
# Required support options
-SUPPORT_REQUIRED='BOOST'
-+SUPPORT_REQUIRED='BOOST BOOST_PROGRAM_OPTIONS X11 GMP MPFR GMPXX CORE ZLIB QT'
++SUPPORT_REQUIRED='BOOST BOOST_PROGRAM_OPTIONS X11 GMP MPFR GMPXX ZLIB QT'
# ---------------------------------------------------------------------
# internal variables
Index: CGAL.spec
===================================================================
RCS file: /cvs/extras/rpms/CGAL/devel/CGAL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CGAL.spec 11 Sep 2006 09:34:00 -0000 1.1
+++ CGAL.spec 11 Sep 2006 13:27:07 -0000 1.2
@@ -2,11 +2,11 @@
Name: CGAL
Version: 3.2.1
-Release: 15%{?dist}
+Release: 17%{?dist}
Summary: Computational Geometry Algorithms Library
Group: System Environment/Libraries
-License: QPL/GPL
+License: QPL/LGPL
URL: http://www.cgal.org/
Source0: ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/%{name}-%{version}.tar.gz
Source10: CGAL-README.Fedora
@@ -14,6 +14,8 @@
Patch2: CGAL-build-library.dpatch
Patch3: CGAL-3.2.1-config.h-endianness_detection.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)
@@ -62,14 +64,18 @@
%prep
%setup -q
-%patch1 -p0
-%patch2 -p1 -b .debian.build-library.back
+%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.back
+%patch3 -p1 -b .endianness-detection.bak
-%patch4 -p1 -b .no_versions.back
+%patch4 -p1 -b .no_versions.bak
+
+%patch5 -p1 -b .build-qt-library.bak
+
+%patch6 -p1 -b .no-static-lib.bak
# fix end-of-lines of several files
@@ -100,7 +106,6 @@
--with-GMP \
--with-GMPXX \
--with-MPFR \
- --with-CGALCORE \
--with-QT3MT
@@ -123,6 +128,8 @@
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
@@ -197,20 +204,21 @@
%doc LICENSE* README.Fedora
%{_libdir}/libCGAL.so.1
%{_libdir}/libCGAL.so.1.0.1
+%{_libdir}/libCGALQt.so.1
+%{_libdir}/libCGALQt.so.1.0.1
%files devel
%defattr(-,root,root,-)
%{_includedir}/CGAL
%{_includedir}/OpenNL
-%{_includedir}/CORE
-%{_libdir}/libCGALQt.a
-%{_libdir}/libcore++.a
+%exclude %{_includedir}/CORE
%{_libdir}/libCGAL.so
-%exclude %{_libdir}/libCGAL.a
+%{_libdir}/libCGALQt.so
%dir %{_datadir}/CGAL/make
%config(noreplace) %{_datadir}/CGAL/make/makefile
%{_bindir}/*
+%exclude %{_bindir}/cgal_make_macosx_app
/etc/profile.d/cgal.*
%doc LICENSE*
@@ -220,9 +228,21 @@
%doc LICENSE*
%{_datadir}/CGAL/demo
%{_datadir}/CGAL/examples
+%exclude %{_datadir}/CGAL/*/*/*.vcproj
%changelog
+* Mon Sep 11 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.2.1-17
+- libCGALQt.so needs -lGL
+- remove %{_bindir}/cgal_make_macosx_app
+
+* Sat Sep 11 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.2.1-16
+- Remove CORE support. Its acceptance in Fedora is controversial (bug #199168).
+- Exclude .vcproj files from the -demos-source subpackage.
+- Added a patch to build *shared* library libCGALQt.
+- Added a patch to avoid building static libraries.
+- Fixed the License: tag.
+
* Thu Aug 17 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.2.1-15
- Change the permissions of /etc/profile.d/cgal.*sh
- Remove the meta package CGAL. CGAL-libs is renamed CGAL.
More information about the fedora-extras-commits
mailing list