[pgRouting] New upstream release 2.0

[Volker Fröhlich]

commit 670aa886e2656c4e5dd6e6f90674dad6d3a9a1e8
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Tue Oct 8 01:00:49 2013 +0200

    New upstream release 2.0
    
    - Drop all patches
    - New license is GPLv2+
    - New source URL
    - Filter private provides
    - Add dependency on postgresql-server

 .gitignore                    |    1 +
 pgRouting.spec                |   80 +++++++++------------------
 pgrouting-1.05-flags.patch    |   13 -----
 pgrouting-1.05-issue35.patch  |   25 ---------
 pgrouting-1.05-libboost.patch |  120 -----------------------------------------
 sources                       |    2 +-
 6 files changed, 28 insertions(+), 213 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 01177fd..62c87a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /pgrouting-1.05.tar.gz
+/v2.0.0.tar.gz
diff --git a/pgRouting.spec b/pgRouting.spec
index 4f8bbbe..83ed57e 100644
--- a/pgRouting.spec
+++ b/pgRouting.spec
@@ -1,32 +1,11 @@
-# Downstream ELGIS has gaul
-%global with_gaul 0
-
-%global tarname pgrouting
-
 Name:		pgRouting
-Version:	1.05
-Release:	7%{?dist}
+Version:	2.0.0
+Release:	1%{?dist}
 Summary:	Provides routing functionality to PostGIS/PostgreSQL
 Group:		Applications/Databases
-
-# shooting_star* are under the latter license
-License:	GPLv2+ and Boost
+License:	GPLv2+
 URL:		http://pgrouting.org
-Source0:    http://download.osgeo.org/%{tarname}/source/%{tarname}-%{version}.tar.gz
-
-# Removes the preset CFLAGS and CXXFLAGS and link gmp
-# https://github.com/pgRouting/pgrouting/issues/64
-Patch1:	    %{tarname}-1.05-flags.patch	
-
-# Various issues with more recent versions of boost
-# https://github.com/pgRouting/pgrouting/issues/45
-# https://github.com/pgRouting/pgrouting/issues/68
-# https://github.com/pgRouting/pgrouting/issues/77
-Patch2:		%{tarname}-1.05-libboost.patch
-
-# Solve issue with NULL geometries
-# https://github.com/pgRouting/pgrouting/issues/35
-Patch3:		%{tarname}-1.05-issue35.patch
+Source0:    https://github.com/%{name}/pgrouting/archive/v%{version}.tar.gz
 
 BuildRequires:	boost-devel
 BuildRequires:	boost-graph
@@ -37,36 +16,28 @@ BuildRequires:	gmp-devel
 BuildRequires:	postgresql-devel
 BuildRequires:	proj-devel
 
-%if 0%{with_gaul}
-BuildRequires:	gaul-devel
-%endif
-
 Requires:	postgis
+# Postgis possibly should require postgresql-server already.
+# Quite the only component of postgis that would serve a purpose without the
+# server on the same machine, is the shape loader. Suse requires postgresql-
+# server on postgis and seemingly got no complaints
+# Putting it in here for now:
+Requires:	postgresql-server
+
+%global _privatelibs librouting.*\.so.*
+%global __provides_exclude ^(%{_privatelibs})$
 
 %description
+#TODO:
 pgRouting extends the PostGIS / PostgreSQL geospatial database to provide
 geospatial routing functionality.
 
-It provides functions for:
-
-- Shortest Path Dijkstra: routing algorithm without heuristics
-- Shortest Path A-Star: routing for large datasets (with heuristics)
-- Shortest Path Shooting-Star: routing with turn restrictions (with heuristics)
-%if 0%{with_gaul}
-- Traveling Salesperson Problem (TSP)
-%endif
-- Driving Distance calculation (Isolines)
-
 
 %prep
-%setup -qn %{tarname}-%{version}
-%patch1 -p1 -b .flags~
-%patch2 -p1 -b .libboost~
-%patch3 -p1 -b .nullgeom~
+%setup -qn pgrouting-%{version}
 
 # Correct FSF address
 # https://github.com/pgRouting/pgrouting/issues/63
-# Corrected for 2.0
 find . \( -name *.cpp -o -name *.c -o -name *.h -o -name *.sql \) -print | xargs -i \
     sed -i 's/59 Temple Place\(, \| - \)Suite 330/51 Franklin Street, Fifth Floor/;s/02111-1307/02110-1301/' {}
 
@@ -74,14 +45,8 @@ find . \( -name *.cpp -o -name *.c -o -name *.h -o -name *.sql \) -print | xargs
 %build
 install -d build
 cd build
-
-# TSP requires libgaul http://sourceforge.net/projects/gaul
-# Last update there was in 2006 and we don't have a package
 %cmake .. \
-	-DWITH_DD=ON \
-%if 0%{with_gaul}
-	-DWITH_TSP=ON
-%endif
+	-DWITH_DD=ON
 
 make VERBOSE=1 %{?_smp_mflags}
 
@@ -91,12 +56,19 @@ make -C build install DESTDIR=%{buildroot}
 
 
 %files
-%doc README.routing COPYING authors.txt BOOST_LICENSE_1_0.txt RELEASE_NOTES
+%doc README.md COPYING
 %{_libdir}/pgsql/*.so
-%{_datadir}/postlbs
-
+%{_datadir}/pgsql/contrib/pgrouting-2.0
+%{_datadir}/pgsql/extension/*
 
 %changelog
+* Sat Sep 28 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.0-1
+- New upstream release; drop all patches
+- New license is GPLv2+
+- New source URL
+- Filter private provides
+- Add dependency on postgresql-server
+
 * Fri Sep 13 2013 Volker Fröhlich <volker27 at gmx.at> - 1.05-7
 - Rebuild for PostgreSQL 9.3
 
diff --git a/sources b/sources
index 81ded45..c4181da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd7c106e3db3c38f7081f1ee9b0e12ae  pgrouting-1.05.tar.gz
+a7b573b7aa4d038bdb24d2401bb33013  v2.0.0.tar.gz