fix: final review issues

mod_mapcache.rpmlintrc

@@ -1,4 +1,3 @@
 addFilter(r'spelling-error .* deployable .*')
 addFilter(r'spelling-error .* libmapcache .*')
 addFilter(r'spelling-error .* fcgi .*')
-addFilter(r'description-line-too-long .*')

mod_mapcache.spec

@@ -1,17 +1,21 @@
 %global project_owner MapServer
 %global project_name mapcache
 
+%global maj 1
+%global min 14
+%global micro 0
+
 Name:           mod_mapcache
-Version:        1.14.0
+Version:        %{maj}.%{min}.%{micro}
 Release:        1%{?dist}
 Summary:        Caching server for WMS layers
-Group:          Development/Tools
-%global dashver %(echo %version | sed 's|\\.|-|g')
 
-License:        MIT
+# mapcache-1.14.0/lib/hmac-sha.c - bsd-3
-URL:            http://mapserver.org/trunk/en/mapcache/
+# mapcache-1.14.0/lib/strptime.c - bsd-3
+License:        MIT AND BSD-3-Clause
+URL:            http://mapserver.org/mapcache/
 
-Source:         https://github.com/%{project_owner}/%{project_name}/releases/download/rel-%{dashver}/mapcache-%{version}.tar.gz
+Source:         https://github.com/%{project_owner}/%{project_name}/releases/download/rel-%{maj}-%{min}-%{micro}/mapcache-%{version}.tar.gz
 Source:         mapcache.sysusers
 
 Source:         https://salsa.debian.org/debian-gis-team/mapcache/-/raw/master/debian/man/mapcache_detail.1.xml
@@ -32,15 +36,18 @@ BuildRequires: libjpeg-turbo-devel
 BuildRequires: libmemcached-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
+BuildRequires: lmdb-devel
 BuildRequires: pixman-devel
 BuildRequires: proj-devel
 BuildRequires: sqlite-devel
 BuildRequires: systemd-rpm-macros
+BuildRequires: xmltoman
 
 %global _description %{expand:
-MapCache is a server that implements tile caching to speed up access to WMS layers.  
+MapCache is a server that implements tile caching to speed up access to WMS
-The primary objectives are to be fast and easily deployable, while offering the  
+layers.  The primary objectives are to be fast and easily deployable, while
-essential features (and more!) expected from a tile caching solution.}
+offering the  essential features (and more!) expected from a tile caching
+solution.}
 
 %description %{_description}
 This is the MapCache module for the Apache web server implementing OGC web
@@ -52,6 +59,7 @@ libmapcache-fcgi.
 
 %package -n libmapcache
 Summary: The shared library for mapcache
+Requires: mapserver%{?_isa}
 
 %description -n libmapcache %{_description}
 The shared library files for libmapcache
@@ -60,8 +68,8 @@ The shared library files for libmapcache
 Summary: Development files for mapcache
 
 %description -n libmapcache-devel %{_description}
-Development files for mapcache; these files are needed when building binary packages
+Development files for mapcache; these files are needed when building binary
-against libmapcache.
+packages against libmapcache.
 
 %package -n libmapcache-doc
 Summary: Documentation files for mapcache
@@ -71,7 +79,7 @@ BuildArch: noarch
 Documentation files for mapcache.
 
 %package -n libmapcache-fcgi
-Summary: fcgi implementation for mapcache
+Summary: An fcgi implementation for mapcache
 Requires: libmapcache%{?_isa} = %{version}-%{release}
 
 %description -n libmapcache-fcgi %{_description}
@@ -79,7 +87,7 @@ This package contains the mapcache FastCGI program, as alternative to the
  Apache module available in mod_mapcache.
 
 %package -n libmapcache-tools
-Summary: tools for mapcache
+Summary: Tools for mapcache
 
 %description -n libmapcache-tools %{_description}
 Provides command-line utilities for mapcache
@@ -105,32 +113,44 @@ done
 install -p -D -m 0644 mapcache.xml %{buildroot}%{_sysconfdir}/mapcache.xml
 install -p -D -m 0644 mapcache.xml.sample %{buildroot}%{_datadir}/mapcache/mapcache.xml.sample
 
+pushd include
+for f in *.h; do
+  install -p -D -m 0644 $f %{buildroot}%{_includedir}/libmapcache/$f;
+done
+popd
+
 install -p -D -d -m 0755 %{buildroot}%{_localstatedir}/cache/mapcache/
 
 install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/mapcache.conf
 
-install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/mapcache_detail.1.xml
+
-install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/mapcache_seed.1.xml
+install -p -D -d -m 0755 %{buildroot}%{_mandir}/man1
+
+xmltoman %{SOURCE2} > %{buildroot}%{_mandir}/man1/mapcache_detail.1
+xmltoman %{SOURCE3} > %{buildroot}%{_mandir}/man1/mapcache_seed.1
 
 %files
-%doc INSTALL.md README.md LICENSE.md  
+%license LICENSE.md
 %{_libdir}/httpd/modules/mod_mapcache.so
 %config(noreplace) %{_sysconfdir}/mapcache.xml
+%dir %{_datadir}/mapcache
 %{_datadir}/mapcache/mapcache.xml.sample
 
 %files -n libmapcache
 %{_libdir}/libmapcache.so.%{version}
 %{_libdir}/libmapcache.so.1
-%{_localstatedir}/cache/mapcache
+%dir %{_localstatedir}/cache/mapcache
 %{_sysusersdir}/mapcache.conf
 
 %files -n libmapcache-doc
-%doc INSTALL.md README.md LICENSE.md  
+%doc INSTALL.md README.md
 %{_mandir}/man1/mapcache_seed.1*
 %{_mandir}/man1/mapcache_detail.1*
 
 %files -n libmapcache-devel
 %{_libdir}/libmapcache.so
+%dir %{_includedir}/libmapcache/
+%{_includedir}/libmapcache/*.h
 
 %files -n libmapcache-fcgi
 %{_bindir}/mapcache.fcgi
@@ -141,9 +161,16 @@ install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/mapcache_seed.1.xml
 
 
 %changelog
+* Sat Jul 06 2024 Neil Hanlon <neil@shrug.pw - 1.14.0-1
+- address review comments for initial package release
+
+* Tue Mar 26 2024 Neil Hanlon <neil@shrug.pw> - 1.14.0-1
+- add mapcache header files
+- add Requires on libmapcache to mapserver
+
 * Mon Mar 11 2024 Neil Hanlon <neil@shrug.pw> - 1.14.0-1
 - Include mapcache.xml
-- split into subpackages following debian
+- split into subpackages following debian as a guide
 
 * Thu Feb 29 2024 Neil Hanlon <neil@shrug.pw> - 1.14.0-0
 - Initial package based on work from ElNinijo