Accepting request 1207881 from Application:Geo

- Update to release 8.2.2

OBS-URL: https://build.opensuse.org/request/show/1207881
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mapserver?expand=0&rev=9

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1728904273
+commit: 0cfa2b58a711a2a09b1b64d0333c25ce77482d47d42818a266e9b660e57c93c8
+url: https://src.opensuse.org/jengelh/mapserver
+revision: master

build.specials.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a300c5eff585ab1b2e728e8c148cf6ad1fef2d53a14c3e51c9a001e9e1b56b6
+size 256

mapserver-7.2.0-beta1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27e7855e3cefb159fcbbaff67aaf9cca7e8a75c38c496783a95713c01487fb28
-size 2676271

mapserver.changes

@@ -1,3 +1,174 @@
+-------------------------------------------------------------------
+Sun Oct 13 20:43:59 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 8.2.2
+  * Use EPSGTreatsAsLatLong and EPSGTreatsAsNorthingEasting to
+    determine inverted axis
+- Delete 0001-Fix-compilation-errors-with-libxml2-2.12.patch
+  (merged)
+- Perform multipython build
+
+-------------------------------------------------------------------
+Mon Aug 19 20:30:15 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Add 0001-Fix-compilation-errors-with-libxml2-2.12.patch
+
+-------------------------------------------------------------------
+Fri Mar  1 07:34:53 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- BuildRequire proj-devel instead of the long deprecated name
+  libproj-devel.
+
+-------------------------------------------------------------------
+Wed Sep 13 16:21:02 UTC 2023 - Dirk Stoecker <opensuse@dstoecker.de>
+
+- update to 8.0.1
+  * PROJ_DATA set through config option: take into account
+    possibility of multiple paths separated by ; on Windows or : on
+    Unix
+  * Resolve a bunch of memory leaks, integer overflows, nullptr
+    dereferences, double-frees.
+  * Allow NULL shapes to be returned in WFS GetFeature requests
+  * Ensure POINT blocks do not contain too many points
+  * https://www.mapserver.org/development/changelog/changelog-8-0.html
+
+-------------------------------------------------------------------
+Sat Nov  5 22:40:24 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Enable PHP8 module build in Tumbleweed again since newer SWIG
+  is available. New subpackage php-mapscriptng emitted as a result.
+  [boo#1204736]
+
+-------------------------------------------------------------------
+Sat Oct  8 20:50:04 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 8
+  * MapServer now requires a config file. To get back mapserver7
+    behavior, copy /usr/share/doc/packages/mapserver/mapserver.conf
+    to mapserver.conf once.
+  * The shp2img utility has been renamed to map2img
+  * FlatGeobuf is now supported natively
+  * Initial OGC API support
+  * PHP native MapScript has been removed, in place of PHPNG
+    (SWIG) MapScript, and PHP unit tests have been re-enabled
+  * New labeling centerline GEOMTRANSFORM method for polygons
+  * Numerical validation of mapfile entries
+  * Removed various deprecated mapfile parameters
+  * New coshp utility to sort shapefile contents as well as sort
+    the associated qix spatial index.
+- Drop mapserver-7.6.1-fix_python_install_path.patch
+  (no longer applicable)
+
+-------------------------------------------------------------------
+Tue Jul 26 14:54:06 UTC 2022 - Boris Manojlovic <boris@steki.net>
+
+- re-enable postgresql support... 
+
+-------------------------------------------------------------------
+Wed Mar  9 12:06:56 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Make the package build on current Tumbleweed again:
+  * Disable PHP bindings (fails to build)
+  * Disable PostgreSQL (fails to configure)
+- Have mapserver-devel require the accompanying library
+
+-------------------------------------------------------------------
+Thu Nov 11 16:38:03 UTC 2021 - Boris Manojlovic <boris@steki.net>
+
+- update to release 7.6.4
+  * PostGIS: fix ST_Intersects() with collections with PostGIS < 2.5. 
+    Fixes https://github.com/MapServer/MapServer/pull/6355#issuecomment-877290417 (Even Rouault) : 3e42e35
+  * Check if sizeunits is not set to pixels (Patrik Sylve) : 3688004
+  * Change legend symbol scale factor when SIZEUNITS is set to METERS (Patrik Sylve) : 39a4ead
+  * spatialindex for sqlite sources in filter (Wouter Visscher) : 955d14e
+  * Make sure requested class with mode=legendicon is not negative. ( #6357 ) (Steve Lime) : 0901b57
+  * Updates to CONTRIBUTING.md (Jeff McKenna) : ee6297a
+  * PostGIS: fix ST_Intersects() with bounding box that is a point (follow-up of fixes #6181 , fixes #6230 ) 
+    (fixes https://github.com/MapServer/MapServer/pull/6347#issuecomment-870002856) (Even Rouault) : 44d5d9c
+  * WMS: make attribute color binding work with FILTER vendor parameter (fixes #6200 ) (Even Rouault) : 1a98ac7
+  * msQueryByFeatures(): avoid potential segfault when reslut set is empty (Even Rouault) : 98ad83a
+  * PostGIS: use ST_Intersects instead of && for bounding box (fixes #6181 , fixes #6230 ) (Even Rouault) : e2ef155
+  * check_single_font(): use quotation mark when msGetGlyphIndex() fails to retrieve the glyph (Even Rouault) : 53ee29e
+  * msGetGlyphByIndex() / msGetGlyphOutline(): tweak debug/error messages (Even Rouault) : 0bbf943
+  * When a font is missing a glyph we try to fallback to using a question mark (Krister Wicksell) : cf4756e
+  * WFS: fix paging with GPKG/Spatialite datasources and non-point geometries (fixes #6325 ) (Even Rouault) : ce8dc4d
+  * Fix querymap failure for polygon layers with labels only (no styles) ( #6262 ) (Tamas Szekeres) : 782ee8b
+  * mapxbase: validate nHeadLen (Max Kellermann) : ee5d5de
+  * mapshape, mapxbase: fix several memory leaks in error code paths (Max Kellermann) : 5e4c504
+  * mapshape: validate numshapes (Max Kellermann) : b5c0e29
+  * mapshape: remove useless null terminator (Max Kellermann) : 9755395
+
+-------------------------------------------------------------------
+Mon May 31 18:33:59 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to 7.6.3
+  * Security: Address flaw in CGI mapfile loading that makes it
+    possible to bypass security controls ( CVE-2021-32062 )
+  * Fix most of remaining Coverity scan warnings with high priority
+  * Use CPLSetConfigOption/CPLGetConfigOption for some
+    CGI/FastCGI-related env vars.
+  * Require url-based symbol values to be pre-defined.
+  * Improved initial check on generating reference maps,
+    avoid crash with label styles
+  * Fix resource leak and pointObj initialization errors.
+- Enable python
+- Refresh mapserver-7.6.1-fix_python_install_path.patch
+
+-------------------------------------------------------------------
+Mon Feb  1 13:20:37 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 7.6.2
+  * Contour layer: take into account nodata value from GDAL raster
+  * WCS 1.1 and 2.0: fix support of netCDF output
+
+-------------------------------------------------------------------
+Wed Jan 20 01:15:24 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Drop BuildRequires on binary library packages; this is wrong.
+- Drop excessive runtime package requirements.
+
+-------------------------------------------------------------------
+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>
+
+- add USE_PROJ to compile flags to enable reprojections (TILE support) 
+
+-------------------------------------------------------------------
+Sat Sep  5 09:14:07 UTC 2020 - Boris Manojlovic <boris@steki.net>
+
+- updated to latest version 7.6.1 
+- fix building on opensuse leap 15.X
+- added mapserver-7.6.1-fix_python_install_path.patch to fix
+  python install location defaulting to arch independent location
+- a lot of changes between versions please look at:
+  https://mapserver.org/development/changelog/changelog-7-6.html#changelog-7-6
+  and at this location:
+  https://github.com/mapserver/mapserver/blob/branch-7-6/HISTORY.TXT
+- security fixes from older versions: CVE-2020-10872 and CVE-2020-10873
+
+-------------------------------------------------------------------
+Fri May 17 09:05:04 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
+
+- update to version 7.4.0
+  * MS RFC 117: PHP 7 MapScript Support Through SWIG
+  * native support for PHP 7 through mapscript (461f827)
+  * Fix potential cross-site scripting (XSS) security issue with
+    [layers] tag
+  * enhanced support for Python 3 mapscript through SWIG
+  * Allow compiling with PROJ 6, but full PROJ 6 support will be
+    included in the future MapServer 8 release (#5766)
+- Drop 5461.patch and cmake-3.12.patch included upstream
+
+-------------------------------------------------------------------
+Thu Sep 13 09:28:34 UTC 2018 - Dirk Stoecker <opensuse@dstoecker.de>
+
+- update to final release
+- Fix build with newer cmake: cmake-3.12.patch
+
 -------------------------------------------------------------------
 Thu Jun  7 11:51:11 UTC 2018 - opensuse@dstoecker.de
 

mapserver.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mapserver
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2014 Ioda-Net Sàrl, Charmoille, Switzerland. Bruno Friedmann (tigerfoot)
 # Copyright (c) 2015 Angelos Tzotsos (kalxas)
 #
@@ -14,37 +14,40 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-#
+%bcond_without python
+%bcond_with ruby
 %define libname libmapserver2
 %define _cgibindir /srv/www/cgi-bin
-%if 0%{?suse_version} >= 1500
+%if 0%{?suse_version} >= 1550
-%define php_name    php7
+# needs swig-4.1 for build
+%bcond_without php
+%define php_name    php8
 %else
-%define php_name    php5
+%bcond_with php
+%define php_name    php7
 %endif
+%{?sle15_python_module_pythons}
 
 Name:           mapserver
-%define realversion 7.2.0-beta1
+Version:        8.2.2
-Version:        7.2.0_beta1
 Release:        0
 Summary:        Environment for building spatially-enabled internet applications
 License:        MIT
 Group:          Productivity/Networking/Web/Servers
-Url:            http://www.mapserver.org
+#Git-Clone:     https://github.com/MapServer/MapServer
-Source:         http://download.osgeo.org/mapserver/%{name}-%{realversion}.tar.gz
+URL:            https://www.mapserver.org/
-# PATCH-FIX-UPSTREAM Fix PHP7 support
+Source:         https://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz
-Patch1:         https://patch-diff.githubusercontent.com/raw/mapserver/mapserver/pull/5461.patch
+Source9:        %{name}-rpmlintrc
 BuildRequires:  FastCGI-devel
 BuildRequires:  apache2-devel
 BuildRequires:  autoconf
 BuildRequires:  cairo-devel
 BuildRequires:  chrpath
 BuildRequires:  cmake >= 2.4
-BuildRequires:  freetype2
 BuildRequires:  freetype2-devel
 BuildRequires:  fribidi-devel
 BuildRequires:  gcc
@@ -57,10 +60,8 @@ BuildRequires:  libcurl-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libgdal-devel >= 1.10
 BuildRequires:  libgeos-devel
-BuildRequires:  libhdf4
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
-BuildRequires:  libproj-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
@@ -69,25 +70,34 @@ BuildRequires:  openjpeg2-devel
 BuildRequires:  pam
 BuildRequires:  pam-devel
 BuildRequires:  postgresql-devel >= 9.1
-BuildRequires:  proj
+BuildRequires:  proj-devel
+%if 0%{?suse_version} >= 1500
+BuildRequires:  postgresql-server-devel >= 9.1
+%endif
 BuildRequires:  libprotobuf-c-devel
-BuildRequires:  protobuf-c
+BuildRequires:  php8-devel
+BuildRequires:  proj
+BuildRequires:  python-rpm-macros
 BuildRequires:  readline-devel
 BuildRequires:  rpm
+%if 0%{with php}
+BuildRequires:  swig >= 4.1
+%else
 BuildRequires:  swig
+%endif
 BuildRequires:  update-alternatives
 BuildRequires:  xorg-x11-libXpm-devel
 BuildRequires:  zlib-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
+%if %{with python}
+BuildRequires:  %python_module devel
+BuildRequires:  %python_module wheel
+BuildRequires:  %python_module pip
+BuildRequires:  %python_module setuptools >= 40.8.0
+%endif
 Requires:       %{libname} = %{version}-%{release}
-Requires:       FastCGI
-Requires:       apache2
-Requires:       fribidi
-Requires:       librsvg
-Requires:       mysql
-Requires:       postgresql >= 9.1
 Requires:       proj
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%python_subpackages
 
 %description
 Mapserver is an internet mapping program that converts GIS data to
@@ -97,27 +107,27 @@ custom GIS data.
 
 %package -n %{libname}
 Summary:        Mapsserver library for mapserver or mapscript module
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
 
 %description -n %{libname}
 Mapserver library for mapserver or mapscript module. you need this lib to run mapserver
 or any of the mapscript module (php, java, python, ruby)
 
-# We don't require apache2_mod-php5 users could have php5 running 
+%package -n php-mapscriptng
-# with other modes (cgi, php-fpm etc)
+Summary:        PHP/MapscriptNG map making extensions to PHP
-
+Group:          Development/Libraries/Other
-%package -n php-mapscript
-Summary:        PHP/Mapscript map making extensions to PHP
-Group:          Development/Libraries/PHP
 Requires:       %{libname} = %{version}-%{release}
-Requires:       apache2
 Provides:       php-mapserver = %{version}-%{release}
 Obsoletes:      php-mapserver < %{version}-%{release}
+%if 0%{with php}
 BuildRequires:  php-devel
+%endif
 Requires:       php
 Requires:       php-gd
+# We don't require apache2_mod-php8 users could have php5 running
+# with other modes (cgi, php-fpm, etc)
 
-%description -n php-mapscript
+%description -n php-mapscriptng
 The PHP/Mapscript extension provides full map customization capabilities within the PHP scripting language.
 
 %package -n perl-mapscript
@@ -137,15 +147,6 @@ within the Perl programming language.
 %package -n python-mapscript
 Summary:        Python/Mapscript map making extensions to Python
 Group:          Development/Languages/Python
-%if %{suse_version} >= 1500
-%define python_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")
-BuildRequires:  python3-devel
-Requires:       python3-base
-%else
-%define python_sitearch %(python2 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")
-BuildRequires:  python2-devel
-Requires:       python2-base
-%endif
 Requires:       %{libname} = %{version}-%{release}
 Provides:       mapserver-python = %{version}-%{release}
 Obsoletes:      mapserver-python < %{version}-%{release}
@@ -175,8 +176,10 @@ within the Java programming language.
 %package -n ruby-mapscript
 Summary:        Ruby/Mapscript map making extensions to Ruby
 Group:          Development/Languages/Ruby
+%if 0%{with ruby}
 BuildRequires:  ruby-common
 BuildRequires:  ruby-devel
+%endif
 Requires:       %{libname} = %{version}-%{release}
 Requires:       ruby
 Provides:       mapserver-ruby = %{version}-%{release}
@@ -189,20 +192,16 @@ within the Ruby programming language.
 %package        devel
 Summary:        Mapserver development files
 Group:          Development/Libraries/Other
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{libname} = %{version}-%{release}
 
 %description    devel
 The Mapserver development package provides necessary files to build
 against the C Mapserver library.
 
 %prep
-%setup -q -n %{name}-%{realversion}
+%autosetup -p1
-%global _default_patch_fuzz 1
-%patch1 -p1
 
 %build
-mkdir build
-cd build
 #Pre export the PREFIX ( having it on the command line doesn't expand correctly for
 #dynamic postgresql location
 export CMAKE_PREFIX_PATH="%{_includedir}:%{_includedir}/fastcgi:%%(pg_config --includedir):%%(pg_config --includedir-server):%%(pg_config --libdir)"
@@ -211,6 +210,9 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
 #specify all options and play with true/false
 #so we always know which option are included in our build.
+%{python_expand #
+mkdir b$python
+pushd b$python
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DCMAKE_SKIP_RPATH=ON \
         -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
@@ -221,6 +223,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DCMAKE_BUILD_TYPE="Release" \
         -DCMAKE_SKIP_INSTALL_RPATH=ON \
         -DCMAKE_SKIP_RPATH=ON \
+        -DPython_EXECUTABLE:PATH="/usr/bin/$python" \
         -DWITH_CAIRO=TRUE \
         -DWITH_CLIENT_WFS=TRUE \
         -DWITH_CLIENT_WMS=TRUE \
@@ -239,12 +242,19 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DWITH_MYSQL=TRUE \
         -DWITH_PERL=TRUE \
         -DCUSTOM_PERL_SITE_ARCH_DIR="%{perl_vendorarch}" \
-        -DWITH_PHP=TRUE \
+%if 0%{with php}
+	-DWITH_PHPNG=TRUE \
+%endif
         -DWITH_POSTGIS=TRUE \
         -DWITH_PROJ=TRUE \
+        -DUSE_PROJ=TRUE \
         -DWITH_PROTOBUFC=TRUE \
+%if 0%{with python}
         -DWITH_PYTHON=TRUE \
+%endif
+%if 0%{with ruby}
         -DWITH_RUBY=TRUE \
+%endif
         -DWITH_SOS=TRUE \
         -DWITH_THREAD_SAFETY=TRUE \
         -DWITH_WCS=TRUE \
@@ -265,40 +275,30 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -Wno-dev \
         ..
 
-make %{?jobs:-j%{jobs}}
+%make_build
+popd
+}
 
 %check
 # make test
 
 %install
-rm -rf %{buildroot}
-
-mkdir -p %{buildroot}/%{_sbindir}
 mkdir -p %{buildroot}/%{_cgibindir}
-mkdir -p %{buildroot}%{_libdir}/%{php_name}/extensions
-mkdir -p %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}%{python_sitearch}/
-mkdir -p %{buildroot}/%{_includedir}/%{name}
-#Comment this look a bit wired to be useful sub-dir should also needed
-# agg, etc 
-cp *.h %{buildroot}/%{_includedir}/%{name}/
 
-# fix some exec bits essentially on examples to make rpmlint happy
+%{python_expand #
-# and avoid rpm adding require
+pushd b$python
-find ./mapscript/ -type f -iname "*.p[ly]" -exec chmod -x {} \;
+%make_install
-find ./mapscript/ -type f -iname "*.rb" -exec chmod -x {} \;
+popd
-find ./mapscript/ -type f -iname "*.dist" -exec chmod -x {} \;
+}
-
-cd build
-%makeinstall DESTDIR="%{buildroot}"
-cd ..
 
+%if 0%{with php}
 mkdir -p %{buildroot}%{_sysconfdir}/%{php_name}/conf.d/
-cat > %{buildroot}%{_sysconfdir}/%{php_name}/conf.d/mapscript.ini <<EOF
+cat > %{buildroot}%{_sysconfdir}/%{php_name}/conf.d/mapscriptng.ini <<EOF
 ; Enable %{name} extension module
 ; For 6.4 we name the symlink here
-extension=php_mapscript.so
+extension=php_mapscriptng.so
 EOF
+%endif
 
 # Install our links
 #@ todo : check
@@ -310,23 +310,27 @@ ln -s %{_bindir}/scalebar %{buildroot}%{_cgibindir}/scalebar
 
 # remove vera fonts, these are provided system wide
 #@todo then we should patch the fonts file example
-rm -rf %{buildroot}%{_docdir}/%{name}/tests/vera
+rm -rf %{buildroot}%{_docdir}/%{name}/tests/vera \
-rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/tests/vera
+       %{buildroot}%{_docdir}/%{name}-%{version}/tests/vera
 
-%clean
+chmod a+x "%{buildroot}/%{_libdir}/libjavamapscript.so"
-rm -rf %{buildroot}
+rm -fv "%buildroot/etc/mapserver-sample.conf" \
+       "%buildroot/usr/etc/mapserver-sample.conf"
+echo >"mapserver.conf" <<-EOF
+	CONFIG
+		ENV
+			MS_MAP_PATTERN "^"
+		END
+	END
+EOF
 
-%post -n %{libname} -p /sbin/ldconfig
+%ldconfig_scriptlets -n %libname
 
-%postun -n %{libname} -p /sbin/ldconfig
+%files -n %name
-
+%doc README.md HISTORY.md MIGRATION_GUIDE.md mapserver.conf etc/mapserver-sample.conf
-%files
+%doc symbols tests fonts
-%defattr(-,root,root)
+%{_bindir}/coshp
-%doc README HISTORY.TXT
+%{_bindir}/map2img
-%doc MIGRATION_GUIDE.txt
-%doc symbols tests
-%doc fonts
-%{_bindir}/shp2img
 %{_bindir}/shptree
 %{_bindir}/sortshp
 %{_bindir}/tile4ms
@@ -336,53 +340,51 @@ rm -rf %{buildroot}
 %{_bindir}/msencrypt
 %{_bindir}/shptreetst
 %{_bindir}/shptreevis
+%dir %_cgibindir
 %{_cgibindir}/mapserv
 %{_cgibindir}/legend
 %{_cgibindir}/scalebar
 
 %files -n %{libname}
-%defattr(-,root,root)
 %{_libdir}/libmapserver.so.*
 
-%files -n php-mapscript
+%if 0%{with php}
-%defattr(-,root,root)
+%files -n php-mapscriptng
-%doc mapscript/php/README
+%config(noreplace) %{_sysconfdir}/%{php_name}/conf.d/mapscriptng.ini
-%doc mapscript/php/examples
+%{_libdir}/%{php_name}/extensions/php_mapscriptng.so*
-%config(noreplace) %{_sysconfdir}/%{php_name}/conf.d/mapscript.ini
+%endif
-%{_libdir}/%{php_name}/extensions/php_mapscript.so*
 
 %files -n perl-mapscript
-%defattr(-,root,root)
+%doc src/mapscript/perl/examples
-%doc mapscript/perl/examples
 %dir %{perl_vendorarch}/auto/mapscript
 %{perl_vendorarch}/auto/mapscript/*
 %{perl_vendorarch}/mapscript.pm
 
-%files -n python-mapscript
+%if 0%{with python}
-%defattr(-,root,root)
+%files %python_files
-%doc mapscript/python/README
+%doc src/mapscript/python/README.rst
-%doc mapscript/python/examples
+%doc src/mapscript/python/examples
-%doc mapscript/python/tests
+%doc src/mapscript/python/tests
-%{python_sitearch}/*
+%python_sitearch/mapscript*
+%endif
 
 %files -n libjavamapscript
-%defattr(-,root,root)
+%doc src/mapscript/java/README
-%doc mapscript/java/README
+%doc src/mapscript/java/examples
-%doc mapscript/java/examples
+%doc src/mapscript/java/tests
-%doc mapscript/java/tests
 %{_libdir}/libjavamapscript.so
 
+%if 0%{with ruby}
 %files -n ruby-mapscript
-%defattr(-,root,root)
 %doc mapscript/ruby/README
 %doc mapscript/ruby/examples
 %{rb_sitearchdir}/mapscript.so
+%endif
 
-%files devel
+%files -n mapserver-devel
-%defattr(-,root,root)
 %dir %{_includedir}/mapserver
 %{_includedir}/mapserver/*
 %{_libdir}/libmapserver.so
-/usr/share/mapserver
+%{_datadir}/mapserver
 
 %changelog