From: Raphaƫl Gertz Date: Thu, 2 Sep 2021 00:12:34 +0000 (+0200) Subject: Remove tmpfiles X-Git-Tag: 2.4.38-6~7 X-Git-Url: https://git.rapsys.eu/ihttpd/commitdiff_plain/84c85f28e85d96930c9f9a3ab52cfadcb80a7d7e?ds=sidebyside Remove tmpfiles Remove modprobe Add buildrequires --- diff --git a/SPECS/ihttpd.spec b/SPECS/ihttpd.spec index 856fef3..0e1d74e 100644 --- a/SPECS/ihttpd.spec +++ b/SPECS/ihttpd.spec @@ -6,7 +6,7 @@ Name: ihttpd Version: 2.4.38 -Release: %mkrel 1 +Release: %mkrel 5 Summary: The most widely used Web server on the Internet License: Apache License Group: System/Servers @@ -14,12 +14,12 @@ URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%version.tar.bz2 Source1: index.bin.c Source2: reboot.sh -Source14: ihttpd.tmpfiles Source15: ihttpd.service Source16: debug-sshd.service Source18: ihttpd.dracut Source19: ihttpd.module-setup Source20: ihttpd.conf +#Source21: ihttpd.modprobe # build/scripts patches Patch1: httpd-2.4.1-apctl.patch Patch2: httpd-2.4.9-apxs.patch @@ -53,6 +53,8 @@ Requires(post): rpm-helper >= 0.24.8-1 Requires(post): openssl makedev Requires(preun): rpm-helper >= 0.24.8-1 +BuildRequires: apr-devel apr-util-devel + %description This package contains the main binary of apache, a powerful, full-featured, efficient and freely-available Web server. Apache is also the most popular Web @@ -176,9 +178,6 @@ gcc index.bin.c -o index.bin #IHttpd sbin install -D -p -m 755 ihttpd %{buildroot}%{_sbindir}/ihttpd -#Tmpfiles.d config -install -D -p -m 644 %{SOURCE14} %{buildroot}%{_tmpfilesdir}/ihttpd.conf - #IHttpd dracut config install -D -p -m 644 %{SOURCE18} %{buildroot}%{_sysconfdir}/dracut.conf.d/99-%{name}.conf @@ -186,6 +185,9 @@ install -D -p -m 644 %{SOURCE18} %{buildroot}%{_sysconfdir}/dracut.conf.d/99-%{n install -d -m 755 %{buildroot}%{_prefix}/lib/dracut/modules.d/99ihttpd install -D -p -m 755 %{SOURCE19} %{buildroot}%{_prefix}/lib/dracut/modules.d/99ihttpd/module-setup.sh +#IHttpd modprobe config +#install -D -p -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/modprobe.d/%{name}.conf + #Ihttpd files install -d -m 755 %{buildroot}%{_prefix}/lib/%{name} install -D -p -m 755 index.bin %{buildroot}%{_prefix}/lib/%{name}/ @@ -198,14 +200,13 @@ install -D -p -m 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/%{name}/ #%find_lang %name %post -%_tmpfilescreate %{name} %_create_ssl_certificate %{name} %files -n %name %config(noreplace) %{_prefix}/lib/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/dracut.conf.d/99-%{name}.conf +#%config(noreplace) %{_sysconfdir}/modprobe.d/%{name}.conf %{_sbindir}/%{name} -%{_tmpfilesdir}/%{name}.conf %dir %{_prefix}/lib/dracut/modules.d/99ihttpd %{_prefix}/lib/dracut/modules.d/99ihttpd/module-setup.sh %dir %{_prefix}/lib/%{name}