From b4d015dd5958f90a48e75eb752195fa302a1be87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 16 Oct 2016 18:35:34 +0300 Subject: [PATCH] _libexecdir -> pkglibdir macro --- lighttpd.spec | 92 +++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/lighttpd.spec b/lighttpd.spec index 9957bb6..43de1af 100644 --- a/lighttpd.spec +++ b/lighttpd.spec @@ -167,7 +167,7 @@ Conflicts: logrotate < 3.7-4 Conflicts: rpm < 4.4.2-0.2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _libexecdir %{_libdir}/%{name} +%define pkglibdir %{_libdir}/%{name} %define _lighttpddir /home/services/%{name} %define _sysconfdir /etc/%{name} @@ -931,7 +931,7 @@ fi %{__automake} %configure \ - --libdir=%{_libexecdir} \ + --libdir=%{pkglibdir} \ %{!?with_ipv6:--disable-ipv6} \ %{!?with_largefile:--disable-lfs} \ %{?with_valgrind:--with-valgrind} \ @@ -976,7 +976,7 @@ cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc cp -p %{SOURCE16} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf cp -p %{SOURCE17} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service -rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.la +rm -f $RPM_BUILD_ROOT%{pkglibdir}/*.la # Install lighttpd images cp -p %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT%{_lighttpddir}/html @@ -1045,11 +1045,11 @@ cp -p %{SOURCE138} $RPM_BUILD_ROOT/etc/tmpwatch/lighttpd-mod_compress.conf # avoid packaging dummy modules %if %{without mysql} -%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/mod_mysql_vhost.so +%{__rm} $RPM_BUILD_ROOT%{pkglibdir}/mod_mysql_vhost.so %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_mysql_vhost.conf %endif %if %{without geoip} -%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/mod_geoip.so +%{__rm} $RPM_BUILD_ROOT%{pkglibdir}/mod_geoip.so %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_geoip.conf %endif @@ -1207,7 +1207,7 @@ fi %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/* %attr(755,root,root) %{_sbindir}/lighttpd %attr(755,root,root) %{_sbindir}/lighttpd-angel -%dir %{_libexecdir} +%dir %{pkglibdir} %{_mandir}/man8/lighttpd.8* %dir %{_lighttpddir} %dir %{_lighttpddir}/cgi-bin @@ -1228,43 +1228,43 @@ fi %files mod_access %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_access.conf -%attr(755,root,root) %{_libexecdir}/mod_access.so +%attr(755,root,root) %{pkglibdir}/mod_access.so %files mod_accesslog %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_accesslog.conf -%attr(755,root,root) %{_libexecdir}/mod_accesslog.so +%attr(755,root,root) %{pkglibdir}/mod_accesslog.so %files mod_alias %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_alias.conf -%attr(755,root,root) %{_libexecdir}/mod_alias.so +%attr(755,root,root) %{pkglibdir}/mod_alias.so %files mod_auth %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_auth.conf -%attr(755,root,root) %{_libexecdir}/mod_auth.so +%attr(755,root,root) %{pkglibdir}/mod_auth.so %files mod_authn_file %defattr(644,root,root,755) -%attr(755,root,root) %{_libexecdir}/mod_authn_file.so +%attr(755,root,root) %{pkglibdir}/mod_authn_file.so %files mod_authn_gssapi %defattr(644,root,root,755) -%attr(755,root,root) %{_libexecdir}/mod_authn_gssapi.so +%attr(755,root,root) %{pkglibdir}/mod_authn_gssapi.so %files mod_authn_ldap %defattr(644,root,root,755) -%attr(755,root,root) %{_libexecdir}/mod_authn_ldap.so +%attr(755,root,root) %{pkglibdir}/mod_authn_ldap.so %files mod_authn_mysql %defattr(644,root,root,755) -%attr(755,root,root) %{_libexecdir}/mod_authn_mysql.so +%attr(755,root,root) %{pkglibdir}/mod_authn_mysql.so %files mod_cgi %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_cgi.conf -%attr(755,root,root) %{_libexecdir}/mod_cgi.so +%attr(755,root,root) %{pkglibdir}/mod_cgi.so %files mod_cgi_php %defattr(644,root,root,755) @@ -1273,166 +1273,166 @@ fi %files mod_cml %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_cml.conf -%attr(755,root,root) %{_libexecdir}/mod_cml.so +%attr(755,root,root) %{pkglibdir}/mod_cml.so %files mod_compress %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/tmpwatch/lighttpd-mod_compress.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_compress.conf -%attr(755,root,root) %{_libexecdir}/mod_compress.so +%attr(755,root,root) %{pkglibdir}/mod_compress.so %dir %attr(775,root,lighttpd) /var/cache/lighttpd/mod_compress %files mod_deflate %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_deflate.conf -%attr(755,root,root) %{_libexecdir}/mod_deflate.so +%attr(755,root,root) %{pkglibdir}/mod_deflate.so %files mod_dirlisting %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_dirlisting.conf -%attr(755,root,root) %{_libexecdir}/mod_dirlisting.so +%attr(755,root,root) %{pkglibdir}/mod_dirlisting.so %files mod_evasive %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_evasive.conf -%attr(755,root,root) %{_libexecdir}/mod_evasive.so +%attr(755,root,root) %{pkglibdir}/mod_evasive.so %files mod_evhost %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_evhost.conf -%attr(755,root,root) %{_libexecdir}/mod_evhost.so +%attr(755,root,root) %{pkglibdir}/mod_evhost.so %files mod_expire %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_expire.conf -%attr(755,root,root) %{_libexecdir}/mod_expire.so +%attr(755,root,root) %{pkglibdir}/mod_expire.so %files mod_extforward %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_extforward.conf -%attr(755,root,root) %{_libexecdir}/mod_extforward.so +%attr(755,root,root) %{pkglibdir}/mod_extforward.so %files mod_fastcgi %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_fastcgi.conf -%attr(755,root,root) %{_libexecdir}/mod_fastcgi.so +%attr(755,root,root) %{pkglibdir}/mod_fastcgi.so %files mod_flv_streaming %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_flv_streaming.conf -%attr(755,root,root) %{_libexecdir}/mod_flv_streaming.so +%attr(755,root,root) %{pkglibdir}/mod_flv_streaming.so %if %{with geoip} %files mod_geoip %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_geoip.conf -%attr(755,root,root) %{_libexecdir}/mod_geoip.so +%attr(755,root,root) %{pkglibdir}/mod_geoip.so %endif %if %{with h264_streaming} %files mod_h264_streaming %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_h264_streaming.conf -%attr(755,root,root) %{_libexecdir}/mod_h264_streaming.so +%attr(755,root,root) %{pkglibdir}/mod_h264_streaming.so %endif %files mod_indexfile %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_indexfile.conf -%attr(755,root,root) %{_libexecdir}/mod_indexfile.so +%attr(755,root,root) %{pkglibdir}/mod_indexfile.so %files mod_magnet %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_magnet.conf -%attr(755,root,root) %{_libexecdir}/mod_magnet.so +%attr(755,root,root) %{pkglibdir}/mod_magnet.so %if %{with mysql} %files mod_mysql_vhost %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_mysql_vhost.conf -%attr(755,root,root) %{_libexecdir}/mod_mysql_vhost.so +%attr(755,root,root) %{pkglibdir}/mod_mysql_vhost.so %endif %files mod_proxy %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_proxy.conf -%attr(755,root,root) %{_libexecdir}/mod_proxy.so +%attr(755,root,root) %{pkglibdir}/mod_proxy.so %files mod_redirect %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_redirect.conf -%attr(755,root,root) %{_libexecdir}/mod_redirect.so +%attr(755,root,root) %{pkglibdir}/mod_redirect.so %files mod_rewrite %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_rewrite.conf -%attr(755,root,root) %{_libexecdir}/mod_rewrite.so +%attr(755,root,root) %{pkglibdir}/mod_rewrite.so %files mod_rrdtool %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_rrdtool.conf -%attr(755,root,root) %{_libexecdir}/mod_rrdtool.so +%attr(755,root,root) %{pkglibdir}/mod_rrdtool.so %attr(640,lighttpd,stats) %ghost /var/lib/lighttpd/lighttpd.rrd %files mod_scgi %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_scgi.conf -%attr(755,root,root) %{_libexecdir}/mod_scgi.so +%attr(755,root,root) %{pkglibdir}/mod_scgi.so %files mod_secdownload %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_secdownload.conf -%attr(755,root,root) %{_libexecdir}/mod_secdownload.so +%attr(755,root,root) %{pkglibdir}/mod_secdownload.so %files mod_setenv %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_setenv.conf -%attr(755,root,root) %{_libexecdir}/mod_setenv.so +%attr(755,root,root) %{pkglibdir}/mod_setenv.so %files mod_simple_vhost %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_simple_vhost.conf -%attr(755,root,root) %{_libexecdir}/mod_simple_vhost.so +%attr(755,root,root) %{pkglibdir}/mod_simple_vhost.so %files mod_ssi %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_ssi.conf -%attr(755,root,root) %{_libexecdir}/mod_ssi.so +%attr(755,root,root) %{pkglibdir}/mod_ssi.so %files mod_staticfile %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_staticfile.conf -%attr(755,root,root) %{_libexecdir}/mod_staticfile.so +%attr(755,root,root) %{pkglibdir}/mod_staticfile.so %files mod_status %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_status.conf -%attr(755,root,root) %{_libexecdir}/mod_status.so +%attr(755,root,root) %{pkglibdir}/mod_status.so %files mod_trigger_b4_dl %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_trigger_b4_dl.conf -%attr(755,root,root) %{_libexecdir}/mod_trigger_b4_dl.so +%attr(755,root,root) %{pkglibdir}/mod_trigger_b4_dl.so %files mod_uploadprogress %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_uploadprogress.conf -%attr(755,root,root) %{_libexecdir}/mod_uploadprogress.so +%attr(755,root,root) %{pkglibdir}/mod_uploadprogress.so %files mod_userdir %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_userdir.conf -%attr(755,root,root) %{_libexecdir}/mod_userdir.so +%attr(755,root,root) %{pkglibdir}/mod_userdir.so %files mod_usertrack %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_usertrack.conf -%attr(755,root,root) %{_libexecdir}/mod_usertrack.so +%attr(755,root,root) %{pkglibdir}/mod_usertrack.so %files mod_webdav %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_webdav.conf -%attr(755,root,root) %{_libexecdir}/mod_webdav.so +%attr(755,root,root) %{pkglibdir}/mod_webdav.so %files php-spawned %defattr(644,root,root,755) -- 2.44.0