SPECS: CGAL.spec - unify adapter cosmetics

Tue Jan 13 21:24:47 CET 2009

Author: glen                         Date: Tue Jan 13 20:24:47 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify adapter cosmetics

---- Files affected:
SPECS:
   CGAL.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/CGAL.spec
diff -u SPECS/CGAL.spec:1.1 SPECS/CGAL.spec:1.2

--- SPECS/CGAL.spec:1.1	Tue Jan 13 20:44:23 2009
+++ SPECS/CGAL.spec	Tue Jan 13 21:24:41 2009
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 %define boost_version 1.32
-
 Summary:	Computational Geometry Algorithms Library
 Name:		CGAL
 Version:	3.3.1
@@ -14,13 +13,14 @@
 Patch2:		%{name}-build-library.patch
 Patch4:		%{name}-install_cgal-no_versions_in_compiler_config.h.patch
 BuildRequires:	blas-devel
-BuildRequires:	lapack-devel
-BuildRequires:	boost-devel >= %boost_version
+BuildRequires:	boost-devel >= %{boost_version}
+BuildRequires:	gmp-c++-devel
 BuildRequires:	gmp-devel
+BuildRequires:	lapack-devel
+BuildRequires:	mpfr-devel
 BuildRequires:	qt-devel >= 3.0
+BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
-BuildRequires:	mpfr-devel
-BuildRequires:	gmp-c++-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,25 +31,24 @@
 The goal is to provide easy access to useful, reliable geometric
 algorithms.
 
-
 %package devel
 Summary:	Development files and tools for CGAL applications
 Group:		Development/Libraries
 Requires:	%{_sysconfdir}/profile.d
 Requires:	%{name} = %{version}-%{release}
 Requires:	blas-devel
+Requires:	boost-devel >= %{boost_version}
+Requires:	gmp-c++-devel
+Requires:	gmp-devel
 Requires:	lapack-devel
+Requires:	mpfr-devel
 Requires:	qt-devel
 Requires:	zlib-devel
-Requires:	gmp-devel
-Requires:	boost-devel >= %{boost_version}
-Requires:	mpfr-devel
-Requires:	gmp-c++-devel
+
 %description devel
 The %{name}-devel package provides the headers files and tools you may
 need to develop applications using CGAL.
 
-
 %package demos-source
 Summary:	Examples and demos of CGAL algorithms
 Group:		Documentation
@@ -71,13 +70,10 @@
 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
+         examples/Boolean_set_operations_2/test.dxf; do
+	if [ -r $f ]; then
+		sed -i -e 's/\r//' $f
+	fi
 done
 
 %build
@@ -102,12 +98,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 case "%{_arch}" in
-        *64* | s390 )
-           SUFFIX=64 ;;
-        * )
-           SUFFIX=32 ;;
+*64* | s390)
+	SUFFIX=64 ;;
+*)
+	SUFFIX=32 ;;
 esac
 
 # Install headers
@@ -116,9 +111,8 @@
 rm -rf $RPM_BUILD_ROOT%{_includedir}/CGAL/config/msvc*
 mv $RPM_BUILD_ROOT%{_includedir}/CGAL/config/*/CGAL/compiler_config.h $RPM_BUILD_ROOT%{_includedir}/CGAL/compiler_config.h
 
-
 # remove the arch-specific comment
-sed -i -e '/System: / d' $RPM_BUILD_ROOT%{_includedir}/CGAL/compiler_config.h
+%{__sed} -i -e '/System: / d' $RPM_BUILD_ROOT%{_includedir}/CGAL/compiler_config.h
 
 # use the timestamp of install_cgal
 touch -r install_cgal $RPM_BUILD_ROOT%{_includedir}/CGAL/compiler_config.h
@@ -187,33 +181,33 @@
 ARCH=`uname -m`
 
 case \$ARCH in
-        x86_64 | ia64 | s390 )
-           SUFFIX=64 ;;
-        * )
-           SUFFIX=32 ;;
+	x86_64|ia64|s390)
+	   SUFFIX=64 ;;
+	*)
+	   SUFFIX=32 ;;
 esac
 
 if [ -z "\$CGAL_MAKEFILE" ] ; then
-  CGAL_MAKEFILE="%{_datadir}/CGAL/cgal-${SUFFIX}.mk"
-  export CGAL_MAKEFILE
+	CGAL_MAKEFILE="%{_datadir}/CGAL/cgal-${SUFFIX}.mk"
+	export CGAL_MAKEFILE
 fi
 EOF
 
 cat > $RPM_BUILD_ROOT%{_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;
+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"
+if (! \$?CGAL_MAKEFILE ) then
+	setenv CGAL_MAKEFILE "%{_datadir}/CGAL/cgal-${SUFFIX}.mk"
 endif
 EOF
 
@@ -223,18 +217,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES
-%attr(755,root,root) %{_libdir}/libCGAL*.so.2
-%attr(755,root,root) %{_libdir}/libCGAL*.so.2.0.1
-
+%attr(755,root,root) %{_libdir}/libCGAL*.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCGAL*.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -244,8 +234,7 @@
 %{_datadir}/CGAL/cgal*.mk
 %attr(755,root,root) %{_bindir}/*
 %exclude %{_bindir}/cgal_make_macosx_app
-%config(noreplace) /etc/profile.d/cgal.*
-
+%config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) /etc/profile.d/cgal.*
 
 %files demos-source
 %defattr(644,root,root,755)
@@ -254,15 +243,16 @@
 %exclude %{_datadir}/CGAL/*/*/*.vcproj
 %exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation
 
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2009/01/13 20:24:41  glen
+- unify adapter cosmetics
+
 Revision 1.1  2009/01/13 19:44:23  djurban
 - from fc9, CGAL is one hell of a painful lib to package
 - Wrote: /home/users/niedakh/rpm/RPMS/CGAL-3.3.1-0.99.x86_64.rpm
 - looks ok, only thing missing is polish descs (still no pl keybd), will bump to rel. 1 later if it works
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/CGAL.spec?r1=1.1&r2=1.2&f=u

