3 Commits

Author SHA1 Message Date
3407c830f9 * Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
- fix systemd service file [SME: 12556]
2024-03-26 21:14:44 -04:00
0f4a4aa637 * Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme
- remove conflicting /etc/httpd/state
2024-03-26 01:10:29 -04:00
75ffeaa08c * Mon Mar 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-3.sme
- conflict with smeserver-proxy
2024-03-25 23:58:45 -04:00
4 changed files with 14 additions and 7 deletions

View File

@@ -1 +0,0 @@
../../var/state/httpd

View File

@@ -6,7 +6,6 @@ Documentation=man:apachectl(8)
[Service]
Type=notify
EnvironmentFile=/etc/sysconfig/httpd
ExecStartPre=/sbin/e-smith/service-status httpd-e-smith
ExecStartPre=/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
ExecStartPre=/sbin/e-smith/systemd/httpd-e-smith-prepare

View File

View File

@@ -4,7 +4,7 @@ Summary: smeserver server and gateway - apache module
%define name smeserver-apache
Name: %{name}
%define version 11.0.0
%define release 2
%define release 5
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -23,15 +23,15 @@ Obsoletes: mod_auth_external
Obsoletes: e-smith-proxypass
Obsoletes: e-smith-apache-proxy
# for the new httpd 2.4 syntax
Conflicts: e-smith-ibays < 2.6.0-19
Conflicts: smeserver-ibays < 2.6.0-19
Conflicts: smeserver-horde < 1.0.0-32
Conflicts: smeserver-php < 3.0.0-43
Conflicts: e-smith-proxy < 5.6.0-11
Conflicts: smeserver-proxy < 5.6.0-11
Conflicts: e-smith-manager < 2.8.0-36
AutoReqProv: no
BuildRequires: smeserver-devtools >= 1.11.0-12
Provides: e-smith-apache = %{version}-%{release}
Provides: e-smith-apache
%description
smeserver server and gateway software - apache module.
@@ -70,8 +70,17 @@ if [ $1 -gt 1 ] ; then
fi
%changelog
* Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
- fix systemd service file [SME: 12556]
* Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme
- remove conflicting /etc/httpd/state
* Mon Mar 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-3.sme
- conflict with smeserver-proxy
* Sat Mar 23 2024 Brian Read <brianr@koozali.org>11.0.0-2.sme
- Change Requires: e-smith- to Requires:smeserver-
- Change Requires: e-smith- to Requires: smeserver-
* Sat Mar 23 2024 Brian Read <brianr@koozali.org>11.0.0-1.sme
- Update Release and Version to base version and 1st release for SME11 [SME: 12518]