[postgresql-ip4r] rebase: new version 2.0

[Pavel Raiskup]

commit 24b7a80c7c0533849f10eabcc01385fd53925f49
Author: Pavel Raiskup <praiskup at redhat.com>
Date:   Wed Sep 18 16:11:18 2013 +0200

    rebase: new version 2.0
    
    Version: 2.0-1
    Resolves: #1009468

 .gitignore           |    2 +-
 postgresql-ip4r.spec |   33 +++++++++++++++------------------
 sources              |    2 +-
 3 files changed, 17 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc5f76e..b261312 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-ip4r-1.05.tar.gz
+/ip4r-extension-2.0.tgz
diff --git a/postgresql-ip4r.spec b/postgresql-ip4r.spec
index 7ef8b0e..2c9f79c 100644
--- a/postgresql-ip4r.spec
+++ b/postgresql-ip4r.spec
@@ -1,48 +1,45 @@
 %define sname	ip4r
 
-Summary:	IPv4 and IPv4 range index types for PostgreSQL
+Summary:	IPv4/v6 type and IPv4/v6 range index type for PostgreSQL
 Name:		postgresql-%{sname}
-Version:	1.05
-Release:	8%{?dist}
+Version:	2.0
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
-Source0:	http://pgfoundry.org/frs/download.php/1581/%{sname}-%{version}.tar.gz
+Source0:	http://ftp.postgresql.org/pub/projects/pgFoundry/ip4r/ip4r/2.0/ip4r-extension-%{version}.tgz
 URL:		http://pgfoundry.org/projects/ip4r
-BuildRequires:	postgresql-devel >= 8.1
-Requires:	postgresql-server >= 8.1
+BuildRequires:	postgresql-devel >= 9.1
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires:	postgresql-server >= 9.3, postgresql-server < 9.4
+
 %description
 ip4 and ip4r are types that contain a single IPv4 address and a range of 
 IPv4 addresses respectively. They can be used as a more flexible, 
 indexable version of the cidr type.
 
 %prep
-%setup -q -n %{sname}-%{version}
-mv README.%{sname} README
+%setup -q -n %{sname}-extension-%{version}
 
 %build
-make USE_PGXS=1 %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-
-install -d %{buildroot}%{_libdir}/pgsql/
-install -d %{buildroot}%{_datadir}/%{name}
-install -m 755 %{sname}.so %{buildroot}%{_libdir}/pgsql/%{sname}.so
-install -p -m 755 %{sname}.sql %{buildroot}%{_datadir}/%{name}
+make install DESTDIR=%{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(644,root,root,755)
-%doc README
-%{_datadir}/%{name}
-%{_datadir}/%{name}/%{sname}*.sql
+%doc %{_docdir}/pgsql/extension/README.ip4r
+%{_datadir}/pgsql/extension/*
 %{_libdir}/pgsql/%{sname}.so
 
 %changelog
+* Wed Sep 18 2013 Pavel Raiskup <praiskup at redhat.com> - 2.0-1
+- rebase to the newest upstream version (#1009468)
+
 * Wed Sep 18 2013 Pavel Raiskup <praiskup at redhat.com> - 1.05-8
 - Rebuild against PostgreSQL 9.3
 
diff --git a/sources b/sources
index 7ec0306..db9bc42 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be4c4b0fbf91eac6b3bc2330d065f4cd  ip4r-1.05.tar.gz
+a17d5b5314eba314ef9d255cf16e48bd  ip4r-extension-2.0.tgz