[rs-commit] r216 - in /mod_ca/trunk: ChangeLog mod_ca.spec.in

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Sat Jan  4 14:51:46 2020
New Revision: 216

Log:
RPM spec file: build natively on Redhat, SUSE and Mageia.

Modified:
    mod_ca/trunk/ChangeLog
    mod_ca/trunk/mod_ca.spec.in

Modified: mod_ca/trunk/ChangeLog
==============================================================================
--- mod_ca/trunk/ChangeLog	(original)
+++ mod_ca/trunk/ChangeLog	Sat Jan  4 14:51:46 2020
@@ -1,3 +1,8 @@
+
+Changes with v0.2.2
+
+ *) RPM spec file: build natively on Redhat, SUSE and Mageia.
+    [Graham Leggett]
 
 Changes with v0.2.1
 

Modified: mod_ca/trunk/mod_ca.spec.in
==============================================================================
--- mod_ca/trunk/mod_ca.spec.in	(original)
+++ mod_ca/trunk/mod_ca.spec.in	Sat Jan  4 14:51:46 2020
@@ -1,26 +1,34 @@
-# RPM Spec file for mod_ca
+# RPM Spec file for @PACKAGE_NAME@
 
-%define name      mod_ca
-%define summary   Apache mod_ca module
-%define license   ASL 2.0
-%define version   @PACKAGE_VERSION@
-%define release   1
-%define group     Web/Applications
-%define source    %{name}-%{version}.tar.bz2
-%define packager  Graham Leggett
-%define buildroot %{_builddir}/%{name}-root
+Name:      @PACKAGE_NAME@
+Version:   @PACKAGE_VERSION@
+Release:   1%{?dist}
+Summary:   Apache @PACKAGE_NAME@ module
+License:   ASL 2.0
+Group:     System Environment/Daemons
+Source:    https://archive.redwax.eu/dist/rs/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2
+Url:       https://redwax.eu/rs/
+BuildRequires: gcc, pkgconfig(apr-1), pkgconfig(apr-util-1), pkgconfig(openssl)
+%if 0%{?is_opensuse}
+BuildRequires: apache2-devel
+Requires: apache2
+%else
+%if 0%{?mgaversion}
+BuildRequires: apache-devel
+Requires: apache
+%else
+BuildRequires: httpd-devel
+Requires: httpd
+%endif
+%endif
 
-Name:      %{name}
-Version:   %{version}
-Release:   %{release}
-Packager:  %{packager}
-Summary:   %{summary}
-License:  %{license}
-Group:     %{group}
-Source:   %{source}
-Prefix:    %{_prefix}
-Buildroot: %{buildroot}
-Requires: httpd
+%if 0%{?is_opensuse}
+%define moduledir %{_libdir}/apache2
+%define includedir %{_includedir}/apache2
+%else
+%define moduledir %{_libdir}/httpd/modules
+%define includedir %{_includedir}/httpd
+%endif
 
 %description
 The Apache mod_ca module supplies a basic provider implementing a simple
@@ -30,6 +38,15 @@
 Group: Development/Libraries
 Summary: Development tools for the mod_ca provider.
 Requires: httpd-devel
+%if 0%{?is_opensuse}
+Requires: apache2-devel
+%else
+%if 0%{?mgaversion}
+Requires: apache-devel
+%else
+Requires: httpd-devel
+%endif
+%endif
 
 %description devel
 Header file for the mod_ca provider implementing a simple certificate
@@ -38,24 +55,21 @@
 %prep
 %setup -q
 %build
-%configure --with-apxs=/usr/bin/apxs
-make
+%configure
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%make_install
 
 %files
-%{_libdir}/httpd/modules/mod_ca.so
-%{_libdir}/httpd/modules/mod_ca_crl.so
-%{_libdir}/httpd/modules/mod_ca_ldap.so
-%{_libdir}/httpd/modules/mod_ca_simple.so
-%{_libdir}/httpd/modules/mod_ca_disk.so
-%{_libdir}/httpd/modules/mod_ca_engine.so
+%{moduledir}/mod_ca.so
+%{moduledir}/mod_ca_crl.so
+%{moduledir}/mod_ca_ldap.so
+%{moduledir}/mod_ca_simple.so
+%{moduledir}/mod_ca_disk.so
+%{moduledir}/mod_ca_engine.so
 
 %files devel
-%{_includedir}/httpd/mod_ca.h
+%{includedir}/mod_ca.h
 
+