X-Git-Url: https://git.rapsys.eu/ihttpd/blobdiff_plain/034a5b59d291e9a01cc9fd6c77aeb1019174e5c6..985f8d25bdd17fde0ffef26373378ac15fb2d8fe:/SPECS/ihttpd.spec

diff --git a/SPECS/ihttpd.spec b/SPECS/ihttpd.spec
index 8de2616..a7c4ff7 100644
--- a/SPECS/ihttpd.spec
+++ b/SPECS/ihttpd.spec
@@ -6,7 +6,7 @@
 
 Name:		ihttpd
 Version:	2.4.20
-Release:	%mkrel 1
+Release:	%mkrel 2
 Summary:	The most widely used Web server on the Internet
 License:	Apache License
 Group:		System/Servers
@@ -16,7 +16,7 @@ Source1:	index.bin.c
 Source2:	reboot.sh
 Source14:	ihttpd.tmpfiles
 Source15:	ihttpd.service
-Source17:	ihttpd.path
+Source16:	debug-sshd.service
 Source18:	ihttpd.dracut
 Source19:	ihttpd.module-setup
 Source20:	ihttpd.conf
@@ -128,6 +128,7 @@ install -m 644 %{SOURCE1} index.bin.c
 # regenerate configure scripts
 autoheader && autoconf || exit 1
 
+# Required to be able to run as root
 export CFLAGS="$RPM_OPT_FLAGS -DBIG_SECURITY_HOLE"
 export LDFLAGS="-Wl,-z,relro,-z,now"
 
@@ -168,7 +169,6 @@ export LYNX_PATH=/usr/bin/links
 %make
 
 export CFLAGS="$RPM_OPT_FLAGS"
-# -m64 -std=c99 -pedantic -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes
 gcc index.bin.c -o index.bin
 
 %install
@@ -176,18 +176,9 @@ gcc index.bin.c -o index.bin
 #IHttpd sbin
 install -D -p -m 755 ihttpd %{buildroot}%{_sbindir}/ihttpd
 
-#IHttpd config
-install -D -p -m 644 %{SOURCE20} %{buildroot}%{_sysconfdir}/ihttpd.conf
-
 #Tmpfiles.d config
 install -D -p -m 644 %{SOURCE14} %{buildroot}%{_tmpfilesdir}/ihttpd.conf
 
-#IHttpd service
-install -D -p -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/ihttpd.service
-
-#IHttpd path
-install -D -p -m 644 %{SOURCE17} %{buildroot}%{_unitdir}/ihttpd.path
-
 #IHttpd dracut config
 install -D -p -m 644 %{SOURCE18} %{buildroot}%{_sysconfdir}/dracut.conf.d/99-%{name}.conf
 
@@ -195,29 +186,30 @@ 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 index.bin
+#Ihttpd files
 install -d -m 755 %{buildroot}%{_prefix}/lib/%{name}
-install -D -p -m 755 index.bin %{buildroot}%{_prefix}/lib/%{name}/index.bin
+install -D -p -m 755 index.bin %{buildroot}%{_prefix}/lib/%{name}/
 install -D -p -m 755 %{SOURCE2} %{buildroot}%{_prefix}/lib/%{name}/reboot.bin
+install -D -p -m 644 %{SOURCE20} %{buildroot}%{_prefix}/lib/%{name}/
+install -D -p -m 644 %{SOURCE15} %{buildroot}%{_prefix}/lib/%{name}/
+install -D -p -m 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/%{name}/
+
 
 %find_lang %name
 
 %post
 %_tmpfilescreate %{name}
-%_post_service %{name}
 %_create_ssl_certificate %{name}
 
-%preun
-%_preun_service %{name}
-
 %files -n %name
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%config(noreplace) %{_prefix}/lib/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/dracut.conf.d/99-%{name}.conf
 %{_sbindir}/%{name}
 %{_tmpfilesdir}/%{name}.conf
-%{_unitdir}/%{name}.path
 %dir %{_prefix}/lib/dracut/modules.d/99ihttpd
 %{_prefix}/lib/dracut/modules.d/99ihttpd/module-setup.sh
-%{_unitdir}/%{name}.service
+%dir %{_prefix}/lib/%{name}
+%{_prefix}/lib/%{name}/%{name}.service
+%{_prefix}/lib/%{name}/debug-sshd.service
 %{_prefix}/lib/%{name}/index.bin
 %{_prefix}/lib/%{name}/reboot.bin