rpms/CGAL/devel CGAL.spec,1.6,1.7

[Laurent Rineau (rineau)]

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23915/devel

Modified Files:
	CGAL.spec 
Log Message:
- 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).
- %{name}-devel now requires all its dependancies.



Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/CGAL.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CGAL.spec	3 Jun 2007 09:49:28 -0000	1.6
+++ CGAL.spec	7 Jun 2007 16:44:02 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -45,6 +45,7 @@
 Summary:        Development files and tools for CGAL applications
 Requires:       %{name} = %{version}-%{release}
 Requires:       boost-devel >= %{boost_version}
+Requires:       blas-devel lapack-devel qt-devel zlib-devel gmp-devel
 Requires:       %{_sysconfdir}/profile.d
 %description devel
 The %{name}-devel package provides the headers files and tools you may need to 
@@ -127,9 +128,9 @@
 cp -a lib/*/lib* %{buildroot}%{_libdir}
 
 # Install makefile:
-mkdir -p %{buildroot}%{_sysconfdir}/CGAL
-touch -r make %{buildroot}%{_sysconfdir}/CGAL
-cp -p make/makefile_* %{buildroot}%{_sysconfdir}/CGAL/makefile
+mkdir -p %{buildroot}%{_datadir}/CGAL
+touch -r make %{buildroot}%{_datadir}/CGAL
+cp -p make/makefile_* %{buildroot}%{_datadir}/CGAL/cgal.mk
 
 # Install demos and examples
 mkdir -p %{buildroot}%{_datadir}/CGAL/
@@ -148,13 +149,13 @@
 /-I.*CGAL_INCL_CONF_DIR/ d
 EOF
 
-sed -i -f makefile.sed %{buildroot}%{_sysconfdir}/CGAL/makefile
+sed -i -f makefile.sed %{buildroot}%{_datadir}/CGAL/cgal.mk
 
 # check if the sed script above has worked:
-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
+grep -q %{_builddir} %{buildroot}%{_datadir}/CGAL/cgal.mk && false
+grep -q %{buildroot} %{buildroot}%{_datadir}/CGAL/cgal.mk && false
+grep -q CGAL/config %{buildroot}%{_datadir}/CGAL/cgal.mk && false
+grep -q -E 'CUSTOM_CXXFLAGS.*(-O2|-g)' %{buildroot}%{_datadir}/CGAL/cgal.mk && false
 
 # Remove -L and -R flags from the makefile
 cat > makefile-noprefix.sed <<'EOF'
@@ -163,11 +164,11 @@
 /'-I$(CGAL_INCL_DIR)'/ d;
 EOF
 
-sed -i -f makefile-noprefix.sed  %{buildroot}%{_sysconfdir}/CGAL/makefile
+sed -i -f makefile-noprefix.sed  %{buildroot}%{_datadir}/CGAL/cgal.mk
 
 # check that the sed script has worked
-grep -q -E -- '-[LI]\$' %{buildroot}%{_sysconfdir}/CGAL/makefile && false
-grep -q -E -- '-R' %{buildroot}%{_sysconfdir}/CGAL/makefile && false
+grep -q -E -- '-[LI]\$' %{buildroot}%{_datadir}/CGAL/cgal.mk && false
+grep -q -E -- '-R' %{buildroot}%{_datadir}/CGAL/cgal.mk && false
 
 
 # Create %{_sysconfdir}/profile.d/ scripts
@@ -175,16 +176,15 @@
 mkdir -p .%{_sysconfdir}/profile.d
 cat > .%{_sysconfdir}/profile.d/cgal.sh <<EOF
 if [ -z "\$CGAL_MAKEFILE" ] ; then
-  CGAL_MAKEFILE="%{_sysconfdir}/CGAL/makefile"
+  CGAL_MAKEFILE="%{_datadir}/CGAL/cgal.mk"
+  export CGAL_MAKEFILE
 fi
-export CGAL_MAKEFILE
 EOF
 
 cat > .%{_sysconfdir}/profile.d/cgal.csh <<EOF
-if ( \$?CGAL_MAKEFILE ) then
-  exit
+if ( ! \$?CGAL_MAKEFILE ) then
+  setenv CGAL_MAKEFILE "%{_datadir}/CGAL/cgal.mk"
 endif
-setenv CGAL_MAKEFILE "$MAKEFILE"
 EOF
 chmod 644 .%{_sysconfdir}/profile.d/cgal.*sh
 
@@ -208,8 +208,8 @@
 %defattr(-,root,root,-)
 %{_includedir}/CGAL
 %{_libdir}/libCGAL*.so
-%dir %{_sysconfdir}/CGAL
-%config(noreplace) %{_sysconfdir}/CGAL/makefile
+%dir %{_datadir}/CGAL
+%{_datadir}/CGAL/cgal.mk
 %{_bindir}/*
 %exclude %{_bindir}/cgal_make_macosx_app
 %config(noreplace) %{_sysconfdir}/profile.d/cgal.*
@@ -225,6 +225,13 @@
 
 
 %changelog
+* Thu Jun  7 2007 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.3-3%{?dist}
+- 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).
+- %{name}-devel now requires all its dependancies.
+
 * Sat Jun  2 2007 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 3.3-2%{?dist}
 - Officiel CGAL-3.3 release
 - Skip file named "skip_vcproj_auto_generation"