From 9bfc62ed987ea74767ea335f4b27d6c9f6b9a6639ec001dc133fc4d9fe761813 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 4 Jul 2016 14:09:30 +0000
Subject: [PATCH] Accepting request 406433 from Application:Geo:Staging

- Update project and download url
- Small spec file cleanups

OBS-URL: https://build.opensuse.org/request/show/406433
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/proj?expand=0&rev=22
---
 proj-4.9.2.tar.gz |  4 ++--
 proj.changes      |  6 ++++++
 proj.spec         | 45 +++++++++++++++++++++++++--------------------
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/proj-4.9.2.tar.gz b/proj-4.9.2.tar.gz
index 5032008..488c30a 100644
--- a/proj-4.9.2.tar.gz
+++ b/proj-4.9.2.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60bf9ad1ed1c18158e652dfff97865ba6fb2b67f1511bc8dceae4b3c7e657796
-size 874816
+oid sha256:9a40de36183d23a395cf51ba7a465e1e6c982b6e4553b31310c42012d188be6b
+size 4045125
diff --git a/proj.changes b/proj.changes
index 6e21f3b..2be7d46 100644
--- a/proj.changes
+++ b/proj.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  4 14:01:52 UTC 2016 - mpluskal@suse.com
+
+- Update project and download url
+- Small spec file cleanups
+
 -------------------------------------------------------------------
 Sun Sep 27 14:47:51 UTC 2015 - mpluskal@suse.com
 
diff --git a/proj.spec b/proj.spec
index 29a59ca..d664231 100644
--- a/proj.spec
+++ b/proj.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package proj
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,17 +23,17 @@ Release:        0
 Summary:        Cartographic projection software
 License:        MIT
 Group:          Productivity/Scientific/Other
-Url:            http://trac.osgeo.org/proj
-Source0:        http://download.osgeo.org/proj/%{name}-%{version}.tar.gz
+Url:            https://trac.osgeo.org/proj/
+Source0:        https://github.com/OSGeo/proj.4/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        ftp://ftp.remotesensing.org/proj/%{name}-datumgrid-1.5.zip
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  unzip
 Provides:       libproj = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n %{libname}
 Summary:        Cartographic projection software
-Group:          Applications/GIS
+Group:          Development/Libraries/C and C++
 
 %package -n libproj-devel
 Summary:        Development files for PROJ
@@ -54,7 +54,7 @@ data with a wide range of selectable projection functions.
 This package contains libproj and the appropriate header files and man pages.
 
 %prep
-%setup -q
+%setup -q -n proj.4-%{version}
 cd nad
 unzip -o %{SOURCE1}
 
@@ -64,34 +64,39 @@ unzip -o %{SOURCE1}
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
-cd src
-cp projects.h %{buildroot}/%{_includedir}/projects.h
+install -D -p -m 0644 src/projects.h %{buildroot}/%{_includedir}/projects.h
 
 %post -n %{libname} -p /sbin/ldconfig
-
 %postun -n %{libname} -p /sbin/ldconfig
 
-%files -n %{libname}
-%defattr(0644,root,root)
-%{_libdir}/*.so.*
-
 %files
 %defattr(-,root,root)
 %doc NEWS AUTHORS COPYING README ChangeLog
 %defattr(0755,root,root)
-%{_bindir}/*
-%dir %{_datadir}/proj
+%{_bindir}/cs2cs
+%{_bindir}/geod
+%{_bindir}/invgeod
+%{_bindir}/invproj
+%{_bindir}/nad2bin
+%{_bindir}/proj
 %defattr(0644,root,root)
-%{_mandir}/man1/*.1*
-%{_datadir}/proj/*
+%{_mandir}/man1/cs2cs.1%{ext_man}
+%{_mandir}/man1/geod.1%{ext_man}
+%{_mandir}/man1/proj.1%{ext_man}
+%{_datadir}/proj/
+
+%files -n %{libname}
+%defattr(0644,root,root)
+%{_libdir}/libproj.so.9*
 
 %files -n libproj-devel
 %defattr(0644,root,root)
-%{_mandir}/man3/*.3*
 %{_includedir}/*.h
-%{_libdir}/*.so
+%{_libdir}/libproj.so
 %{_libdir}/pkgconfig/proj.pc
+%{_mandir}/man3/geodesic.3%{ext_man}
+%{_mandir}/man3/pj_init.3%{ext_man}
 
 %changelog