From 4dfcf5c84be79b8172c913d1bfbf25361e068170 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <git>
Date: Jun 30 2015 09:02:11 +0000
Subject: New upstream release 4.6.1


The patch is removed, because the pull request is merged into 4.6.1.

See the pull-request:
  https://github.com/CGAL/cgal/pull/132

See the list of fixed bugs:
  https://github.com/CGAL/cgal/issues?&q=milestone%3A4.6.1+is%3Aclosed+-label%3Ainvalid

---

diff --git a/.gitignore b/.gitignore
index 848ef54..62beb7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ results_CGAL
 /CGAL-4.5.2.tar.xz
 /CGAL-4.6-beta1.tar.xz
 /CGAL-4.6.tar.xz
+/CGAL-4.6.1.tar.xz
diff --git a/0001-Use-get_filename_component-to-manipulate-paths.patch b/0001-Use-get_filename_component-to-manipulate-paths.patch
deleted file mode 100644
index a8b0c10..0000000
--- a/0001-Use-get_filename_component-to-manipulate-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f740a7aa4102be94fa401a15cbd440a95856019f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Philipp=20M=C3=B6ller?= <bootsarehax@gmail.com>
-Date: Mon, 22 Jun 2015 11:14:04 +0200
-Subject: [PATCH] Use get_filename_component to manipulate paths
-
-This caused a bug in CMake>=3.3.0 when file(GLOB) is not adding multiple
-slashes. The lack of trailing slashes is guaranteed and documented in
-get_filename_component.
----
- Installation/src/CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt
-index 2cfbf2b..bee51f0 100644
---- a/Installation/src/CMakeLists.txt
-+++ b/Installation/src/CMakeLists.txt
-@@ -117,8 +117,9 @@ set(CGAL_CONFIGURED_LIBRARIES "")
- foreach(package ${CGAL_CONFIGURED_PACKAGES}) 
-   file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL_*/CMakeLists.txt)
-   foreach (libconfigfile ${CONFIGURED_LIBS_IN_PACKAGE})
--    string(REPLACE "${package}/src/" "" libconfigfile ${libconfigfile})
--    string(REPLACE "//CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile})
-+    get_filename_component(CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile} DIRECTORY)
-+    get_filename_component(CGAL_CONFIGURED_LIBRARY_NAME ${CGAL_CONFIGURED_LIBRARY_NAME} NAME)
-+
-     if (NOT ${CGAL_CONFIGURED_LIBRARY_NAME} STREQUAL "CGAL")
- 
-      message(STATUS "Sources for CGAL component library '${CGAL_CONFIGURED_LIBRARY_NAME}' detected")
--- 
-1.9.3
-
diff --git a/CGAL.spec b/CGAL.spec
index 93bd59e..3c3189a 100644
--- a/CGAL.spec
+++ b/CGAL.spec
@@ -10,11 +10,11 @@
 #global alphatag beta1
 %global alphaname %{nil}
 #global alphaname -%{alphatag}
-%global gforgedlnumber 34705
+%global gforgedlnumber 34900
 
 Name:           CGAL
-Version:        4.6
-Release:        3%{alphatag}%{?dist}
+Version:        4.6.1
+Release:        1%{alphatag}%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -23,9 +23,6 @@ URL:            http://www.cgal.org/
 Source0:        https://gforge.inria.fr/frs/download.php/%{gforgedlnumber}/%{name}-%{version}%{alphaname}.tar.xz
 Source10:       CGAL-README.Fedora
 
-# https://github.com/CGAL/cgal/pull/131
-Patch0:         0001-Use-get_filename_component-to-manipulate-paths.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Required devel packages.
@@ -71,7 +68,6 @@ CGAL algorithms.
 
 %prep
 %setup -q -n %{name}-%{version}%{alphaname}
-%patch0 -p2
 
 # Fix some file permissions
 #chmod a-x include/CGAL/export/ImageIO.h
@@ -138,6 +134,10 @@ rm -rf %{buildroot}
 %exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation
 
 %changelog
+* Tue Jun 30 2015 Laurent Rineau <lrineau@renoir.geometryfactory.com> - 4.6.1-1
+- New upstream release
+- Remove Patch0, already in CGAL-4.6.1.
+
 * Mon Jun 22 2015 Laurent Rineau <lrineau@renoir.geometryfactory.com> - 4.6-3
 - Add Patch0: support for CMake-3.3 in Rawhide/F23
 
diff --git a/sources b/sources
index 306aaee..75aaf35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65fa7e17cd654ef68da47df608000007  CGAL-4.6.tar.xz
+6018b8686737ed7bff45f743a7780758  CGAL-4.6.1.tar.xz