summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cgit.spec11
1 files changed, 6 insertions, 5 deletions
diff --git a/cgit.spec b/cgit.spec
index 6be58c5..605008d 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -6,6 +6,7 @@
%global filterdir %{_libexecdir}/%{name}/filters
%global scriptdir %{_localstatedir}/www/cgi-bin
%global cgitdata %{_datadir}/%{name}
+%global httpdconfd %{_sysconfdir}/httpd/conf.d
# GPG signing key fingerprints
%global gpg_cgit AB9942E6D4A4CFC3412620A749FC7012A5DE03AE
@@ -183,10 +184,9 @@ highlight --print-style --style-outfile=stdout >> cgit.css
%install
%make_install install install-man
-install -d -m0755 %{buildroot}%{_sysconfdir}/httpd/conf.d
-install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/cgitrc
-install -p -m0644 httpd.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/cgit.conf
-install -d -m0755 %{buildroot}%{cachedir}
+mkdir -p %{buildroot}%{cachedir}
+install -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/cgitrc
+install -Dp -m0644 httpd.conf %{buildroot}%{httpdconfd}/%{name}.conf
%check
@@ -202,7 +202,7 @@ make test
%dir %{_sysconfdir}/httpd
%dir %{_sysconfdir}/httpd/conf.d
%endif
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/cgit.conf
+%config(noreplace) %{httpdconfd}/%{name}.conf
%dir %attr(-,apache,root) %{cachedir}
%{cgitdata}
%{filterdir}
@@ -215,6 +215,7 @@ make test
%changelog
* Mon Jul 26 2021 Todd Zullinger <tmz@pobox.com> - 1.2.3-7
- update SELinux README
+- simplify install commands
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild