rpms/CGAL/devel .cvsignore, 1.9, 1.10 CGAL.spec, 1.33, 1.34 sources, 1.9, 1.10

Laurent Rineau rineau at fedoraproject.org
Thu Jul 1 10:42:08 UTC 2010 

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32064

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Thu Jul  1 2010 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.6.1-1
- New upstream release
- Fix some file permissions (rpmlint warnings)
- Upstream version CGAL-3.6.1 has not modified the build number of the
  SOVERSION. Fix that with a CMake option -DCGAL_SOVERSION=...
- Fix changelog: use of macro is a single percent, instead of two, and add
  my real name so several changelog entries.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Mar 2010 13:55:55 -0000	1.9
+++ .cvsignore	1 Jul 2010 10:42:07 -0000	1.10
@@ -1 +1 @@
-CGAL-3.6-beta1.tar.xz
+CGAL-3.6.1.tar.xz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/CGAL.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- CGAL.spec	6 Mar 2010 13:55:55 -0000	1.33
+++ CGAL.spec	1 Jul 2010 10:42:08 -0000	1.34
@@ -1,16 +1,15 @@
 %define boost_version 1.34
 %define qt_version 4.2
-%define beta_tag -beta1
 
 Name:           CGAL
-Version:        3.6
-Release:        0.1.beta1%{?dist}
+Version:        3.6.1
+Release:        1%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
 License:        QPL and LGPLv2 and LGPLv2+
 URL:            http://www.cgal.org/
-Source0:        https://gforge.inria.fr/frs/download.php/26527/CGAL-3.6-beta1.tar.xz
+Source0:        https://gforge.inria.fr/frs/download.php/27224/CGAL-3.6.1.tar.xz
 Source10:       CGAL-README.Fedora
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,17 +57,25 @@ CGAL algorithms.
 
 
 %prep
-%setup -q -n CGAL-3.6-beta1
+%setup -q
 
-chmod a-x demo/Circular_kernel_2/Circular_kernel_2.qrc
+# Fix some file permissions
+chmod a-x examples/Boolean_set_operations_2/amer_*.bps
+chmod a-x examples/Boolean_set_operations_2/bezier_traits_adapter2.cpp
+chmod a-x demo/Segment_Delaunay_graph_2/include/CGAL/Constraints_loader.h
 
-# Install README.Fedora here, to include it in %doc
+# Install README.Fedora here, to include it in %%doc
 install -p -m 644 %{SOURCE10} ./README.Fedora
 
 %build
+
+if [ "%{version}" = "3.6.1" ]; then
+  CHANGE_SOVERSION="-DCGAL_SOVERSION:STRING=5.0.1"
+fi
+
 mkdir build
 pushd build
-%cmake -DCGAL_INSTALL_LIB_DIR=%{_lib} ..
+%cmake -DCGAL_INSTALL_LIB_DIR=%{_lib} ${CHANGE_SOVERSION} ..
 make VERBOSE=1 %{?_smp_mflags}
 popd
 
@@ -101,7 +108,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES README.Fedora
 %{_libdir}/libCGAL*.so.5
-%{_libdir}/libCGAL*.so.5.0.0
+%{_libdir}/libCGAL*.so.5.0.1
 
 
 %files devel
@@ -123,22 +130,30 @@ rm -rf %{buildroot}
 %exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation
 
 %changelog
-* Sat Mar  6 2010  <Laurent.Rineau__fedora at normalesup.org> - 3.6-0.1.beta1
+* Thu Jul  1 2010 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.6.1-1
+- New upstream release
+- Fix some file permissions (rpmlint warnings)
+- Upstream version CGAL-3.6.1 has not modified the build number of the
+  SOVERSION. Fix that with a CMake option -DCGAL_SOVERSION=...
+- Fix changelog: use of macro is a single percent, instead of two, and add
+  my real name so several changelog entries.
+
+* Sat Mar  6 2010 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.6-0.1.beta1
 - New upstream release
 
-* Mon Jan 18 2010  <Laurent.Rineau__fedora at normalesup.org> - 3.5.1-2
+* Mon Jan 18 2010 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.5.1-2
 - Rebuild after Boost upgrade (and soname bump)
 
-* Thu Dec 24 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5.1-1
+* Thu Dec 24 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.5.1-1
 - New upstream release
 
 * Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5-3
 - Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
 
-* Mon Nov  2 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5-2
+* Mon Nov  2 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.5-2
 - Use system's FindBoost macro instead of a copy from CGAL (bug #532431).
 
-* Sun Oct 18 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5-1
+* Sun Oct 18 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.5-1
 - New upstream release: finale version of CGAL-3.5.
 
 * Thu Jul 30 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.5-0.2.beta1
@@ -152,7 +167,7 @@ rm -rf %{buildroot}
 * 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
 
-* Thu Feb 26 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.3.1-13
+* Thu Feb 26 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.3.1-13
 - noarch CGAL-demos-source, which is purely data.
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.1-12
@@ -213,8 +228,8 @@ rm -rf %{buildroot}
   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
+    - %%{_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 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Mar 2010 13:55:55 -0000	1.9
+++ sources	1 Jul 2010 10:42:08 -0000	1.10
@@ -1 +1 @@
-b2643720b5735904ef6ef30f37d2dc93  CGAL-3.6-beta1.tar.xz
+3ed551a5ff6797882e512c16ed24d2f6  CGAL-3.6.1.tar.xz

More information about the scm-commits mailing list