From 2b385e7cf4fc2927a6d5127fe250f1071e5b49d13b6da07b19f169f339d5cf1b Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 24 Dec 2020 07:50:43 +0000
Subject: [PATCH] Accepting request 858394 from
 home:jengelh:branches:Application:Geo

- Modernize and ready specfile for Factory

OBS-URL: https://build.opensuse.org/request/show/858394
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=117
---
 mapserver.changes |  5 +++++
 mapserver.spec    | 19 +++----------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/mapserver.changes b/mapserver.changes
index ecc982b..acca75c 100644
--- a/mapserver.changes
+++ b/mapserver.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 23 20:07:24 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Modernize and ready specfile for Factory
+
 -------------------------------------------------------------------
 Tue Sep  8 19:49:30 UTC 2020 - Boris Manojlovic <boris@steki.net>
 
diff --git a/mapserver.spec b/mapserver.spec
index 28aec11..68b78fe 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -39,6 +39,7 @@ License:        MIT
 Group:          Productivity/Networking/Web/Servers
 Url:            https://www.mapserver.org/
 Source:         https://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz
+Source9:        %{name}-rpmlintrc
 # PATCH-FIX-UPSTREAM mapserver-7.6.1-fix_python_install_path.patch fixing python installation path badly defaulting to arch independent location
 Patch0:         mapserver-7.6.1-fix_python_install_path.patch
 BuildRequires:  FastCGI-devel
@@ -93,7 +94,6 @@ Requires:       librsvg
 Requires:       mysql
 Requires:       postgresql >= 9.1
 Requires:       proj
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Mapserver is an internet mapping program that converts GIS data to
@@ -282,14 +282,12 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -Wno-dev \
         ..
 
-make %{?jobs:-j%{jobs}}
+%make_build
 
 %check
 # make test
 
 %install
-rm -rf %{buildroot}
-
 mkdir -p %{buildroot}/%{_sbindir}
 mkdir -p %{buildroot}/%{_cgibindir}
 mkdir -p %{buildroot}%{_libdir}/%{php_name}/extensions
@@ -307,7 +305,7 @@ find ./mapscript/ -type f -iname "*.rb" -exec chmod -x {} \;
 find ./mapscript/ -type f -iname "*.dist" -exec chmod -x {} \;
 
 cd build
-%makeinstall DESTDIR="%{buildroot}"
+%make_install
 cd ..
 
 mkdir -p %{buildroot}%{_sysconfdir}/%{php_name}/conf.d/
@@ -330,15 +328,11 @@ ln -s %{_bindir}/scalebar %{buildroot}%{_cgibindir}/scalebar
 rm -rf %{buildroot}%{_docdir}/%{name}/tests/vera
 rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/tests/vera
 
-%clean
-rm -rf %{buildroot}
-
 %post -n %{libname} -p /sbin/ldconfig
 
 %postun -n %{libname} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc README.rst HISTORY.TXT
 %doc MIGRATION_GUIDE.txt
 %doc symbols tests
@@ -358,18 +352,15 @@ rm -rf %{buildroot}
 %{_cgibindir}/scalebar
 
 %files -n %{libname}
-%defattr(-,root,root)
 %{_libdir}/libmapserver.so.*
 
 %files -n php-mapscript
-%defattr(-,root,root)
 %doc mapscript/php/README
 %doc mapscript/php/examples
 %config(noreplace) %{_sysconfdir}/%{php_name}/conf.d/mapscript.ini
 %{_libdir}/%{php_name}/extensions/php_mapscript.so*
 
 %files -n perl-mapscript
-%defattr(-,root,root)
 %doc mapscript/perl/examples
 %dir %{perl_vendorarch}/auto/mapscript
 %{perl_vendorarch}/auto/mapscript/*
@@ -377,7 +368,6 @@ rm -rf %{buildroot}
 
 %if %{with python}
 %files -n python-mapscript
-%defattr(-,root,root)
 %doc mapscript/python/README.rst
 %doc mapscript/python/examples
 %doc mapscript/python/tests
@@ -385,7 +375,6 @@ rm -rf %{buildroot}
 %endif
 
 %files -n libjavamapscript
-%defattr(-,root,root)
 %doc mapscript/java/README
 %doc mapscript/java/examples
 %doc mapscript/java/tests
@@ -393,14 +382,12 @@ rm -rf %{buildroot}
 
 %if %{with ruby}
 %files -n ruby-mapscript
-%defattr(-,root,root)
 %doc mapscript/ruby/README
 %doc mapscript/ruby/examples
 %{rb_sitearchdir}/mapscript.so
 %endif
 
 %files devel
-%defattr(-,root,root)
 %dir %{_includedir}/mapserver
 %{_includedir}/mapserver/*
 %{_libdir}/libmapserver.so