mod_mapcache.rpmlintrc

@@ -1,4 +0,0 @@
-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,24 +1,21 @@
 %global project_owner MapServer
 %global project_name mapcache
 
-%global maj 1
-%global min 14
-%global rev 0
-
 Name:           mod_mapcache
-Version:        %{maj}.%{min}.%{rev}
+Version:        1.14.0
 Release:        1%{?dist}
 Summary:        Caching server for WMS layers
 Group:          Development/Tools
+%global dashver %(echo %version | sed 's|\\.|-|g')
 
 License:        MIT
-URL:            http://mapserver.org/
+URL:            http://mapserver.org/trunk/en/mapcache/
 
-Source0:         https://github.com/%{project_owner}/%{project_name}/releases/download/rel-%{maj}-%{min}-%{rev}/mapcache-%{version}.tar.gz
+Source:         https://github.com/%{project_owner}/%{project_name}/releases/download/rel-%{dashver}/mapcache-%{version}.tar.gz
-Source1:         mapcache.sysusers
+Source:         mapcache.sysusers
 
-Source2:         https://salsa.debian.org/debian-gis-team/mapcache/-/raw/master/debian/man/mapcache_detail.1.xml
+Source:         https://salsa.debian.org/debian-gis-team/mapcache/-/raw/master/debian/man/mapcache_detail.1.xml
-Source3:         https://salsa.debian.org/debian-gis-team/mapcache/-/raw/master/debian/man/mapcache_seed.1.xml
+Source:         https://salsa.debian.org/debian-gis-team/mapcache/-/raw/master/debian/man/mapcache_seed.1.xml
 
 Requires:       httpd
 Requires:       libmapcache%{?_isa} = %{version}-%{release}
@@ -39,7 +36,7 @@ BuildRequires: pixman-devel
 BuildRequires: proj-devel
 BuildRequires: sqlite-devel
 BuildRequires: systemd-rpm-macros
-
+	
 %global _description %{expand:
 MapCache is a server that implements tile caching to speed up access to WMS layers.  
 The primary objectives are to be fast and easily deployable, while offering the  
@@ -91,6 +88,7 @@ Provides command-line utilities for mapcache
 %autosetup -n %{project_name}-%{version}
 
 %build
+#%cmake -DWITH_MEMCACHE=1 -DCMAKE_SKIP_BUILD_RPATH=TRUE . 
 %cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} -DWITH_MEMCACHE=1 -DCMAKE_SKIP_BUILD_RPATH=TRUE . 
 %cmake_build
 
@@ -100,13 +98,11 @@ Provides command-line utilities for mapcache
 for f in \
   %{buildroot}%{_bindir}/{mapcache_seed,mapcache.fcgi,mapcache_detail} \
   %{buildroot}%{_libdir}/libmapcache.so* \
-  %{buildroot}%{_httpd_moddir}/mod_mapcache.so;
+  %{buildroot}%{_libdir}/httpd/modules/mod_mapcache.so;
 do
  chrpath --delete $f 
 done
 
-install -p -D -m 0644 include/ %{buildroot}%{_libdir}/include/
-
 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
 
@@ -118,9 +114,8 @@ install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/mapcache_detail.1.x
 install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/mapcache_seed.1.xml
 
 %files
-%doc INSTALL.md README.md
+%doc INSTALL.md README.md LICENSE.md  
-%license LICENSE.md
+%{_libdir}/httpd/modules/mod_mapcache.so
-%{_httpd_moddir}/mod_mapcache.so
 %config(noreplace) %{_sysconfdir}/mapcache.xml
 %{_datadir}/mapcache/mapcache.xml.sample
 
@@ -131,7 +126,7 @@ install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/mapcache_seed.1.xml
 %{_sysusersdir}/mapcache.conf
 
 %files -n libmapcache-doc
-%doc INSTALL.md README.md
+%doc INSTALL.md README.md LICENSE.md  
 %{_mandir}/man1/mapcache_seed.1*
 %{_mandir}/man1/mapcache_detail.1*