summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe2011-12-09 12:06:22 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit9cddf2d8ab5f8020de0fcc8e6d97a66f5d57a1ff (patch)
tree67ec122af0e3aa0a6a2f3ca27ed625509be676e9
parentb52ca3f283e36e885bdd2194cea774ffef4a8585 (diff)
downloadapache-mod_annodex-9cddf2d8ab5f8020de0fcc8e6d97a66f5d57a1ff.zip
apache-mod_annodex-9cddf2d8ab5f8020de0fcc8e6d97a66f5d57a1ff.tar.gz
- fix config dirHEADmaster
Changed files: apache-mod_annodex.spec -> 1.7
-rw-r--r--apache-mod_annodex.spec11
1 files changed, 5 insertions, 6 deletions
diff --git a/apache-mod_annodex.spec b/apache-mod_annodex.spec
index 6b99463..ef81e79 100644
--- a/apache-mod_annodex.spec
+++ b/apache-mod_annodex.spec
@@ -20,7 +20,7 @@ Requires: apr >= 1:1.0.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
%description
mod_annodex is a handler for type application/x-annodex. It provides
@@ -60,11 +60,10 @@ rm -rf annodex
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
-install .libs/mod_annodex.so $RPM_BUILD_ROOT%{_pkglibdir}
-
-cat annodex.load annodex.conf > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_annodex.conf
+install -p .libs/mod_annodex.so $RPM_BUILD_ROOT%{_pkglibdir}
+cat annodex.load annodex.conf > $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_annodex.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -80,5 +79,5 @@ fi
%files
%defattr(644,root,root,755)
%doc LICENSE README
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/90_mod_annodex.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/90_mod_annodex.conf
%attr(755,root,root) %{_pkglibdir}/mod_annodex.so