From e869bfadf77aa24f5e56ed2ce62a491fef19d7891121a1a25eaa2e3157b80752 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Sun, 8 Mar 2015 20:27:30 +0000
Subject: [PATCH] Accepting request 289857 from
 home:pluskalm:branches:Application:Geo

- Cleanup spec file with spec-cleaner
- Cleanup dependecies
- Use url for source
- Update url

OBS-URL: https://build.opensuse.org/request/show/289857
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/proj?expand=0&rev=17
---
 proj-4.8.0.tar.bz2 |  3 ---
 proj-4.8.0.tar.gz  |  3 +++
 proj.changes       |  8 ++++++++
 proj.spec          | 44 ++++++++++++++++++--------------------------
 4 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 proj-4.8.0.tar.bz2
 create mode 100644 proj-4.8.0.tar.gz

diff --git a/proj-4.8.0.tar.bz2 b/proj-4.8.0.tar.bz2
deleted file mode 100644
index 0259a7e..0000000
--- a/proj-4.8.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da9e5054454ff24bea11074ff4eadd3bb078d9b2d42f57e7a362e8067ac394f5
-size 597580
diff --git a/proj-4.8.0.tar.gz b/proj-4.8.0.tar.gz
new file mode 100644
index 0000000..55404b1
--- /dev/null
+++ b/proj-4.8.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2db2dbf0fece8d9880679154e0d6d1ce7c694dd8e08b4d091028093d87a9d1b5
+size 785279
diff --git a/proj.changes b/proj.changes
index e2f470f..d704ae0 100644
--- a/proj.changes
+++ b/proj.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Mar  8 09:59:50 UTC 2015 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Cleanup dependecies
+- Use url for source
+- Update url
+
 -------------------------------------------------------------------
 Fri Apr 20 12:09:29 UTC 2012 - tzotsos@opensuse.org
 
diff --git a/proj.spec b/proj.spec
index 4f1f413..0ade43f 100644
--- a/proj.spec
+++ b/proj.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package proj
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -16,38 +16,31 @@
 #
 
 
+%define libname lib%{name}0
 Name:           proj
 Version:        4.8.0
 Release:        0
 Summary:        Cartographic projection software
 License:        MIT
 Group:          Productivity/Scientific/Other
-Url:            ftp://ftp.remotesensing.org/proj/
-Source0:        proj-%{version}.tar.bz2
-Source1:        proj-datumgrid-1.5.zip
-BuildRequires:  bzip2
-BuildRequires:  unzip
-%if 0%{?centos_version} || 0%{?rhel_version}
-BuildRequires:  pkgconfig
-%else
+Url:            http://trac.osgeo.org/proj
+Source0:        http://download.osgeo.org/proj/%{name}-%{version}.tar.gz
+Source1:        ftp://ftp.remotesensing.org/proj/%{name}-datumgrid-1.5.zip
 BuildRequires:  pkg-config
-%endif
+BuildRequires:  unzip
 Provides:       libproj = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Prefix:         %{_prefix}
-
-%package -n libproj0
 
+%package -n %{libname}
 Summary:        Cartographic projection software
 Group:          Applications/GIS
 
 %package -n libproj-devel
-
 Summary:        Development files for PROJ
 Group:          Development/Libraries/C and C++
-Requires:       libproj0 = %{version}
+Requires:       %{libname} = %{version}
 
-%description -n libproj0
+%description -n %{libname}
 This package the library for performing respective
 forward and inverse transformation of cartographic data to or from cartesian
 data with a wide range of selectable projection functions.
@@ -61,27 +54,26 @@ data with a wide range of selectable projection functions.
 This package contains libproj and the appropriate header files and man pages.
 
 %prep
-%setup -q -b 0 -n proj-%{version}
+%setup -q 
 cd nad
 unzip -o %{SOURCE1}
 
 %build
-%configure  --disable-static
-make
+%configure \
+	--disable-static
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-rm %{buildroot}/%{_libdir}/*.la
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
 cd src
 cp projects.h %{buildroot}/%{_includedir}/projects.h
 
-%post -n libproj0 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -n libproj0 -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%clean
-
-%files -n libproj0
+%files -n %{libname}
 %defattr(0644,root,root)
 %{_libdir}/*.so.*