- release 2: fixed paths, unified

[packages/apache-mod_cfg_ldap.git] / apache-mod_cfg_ldap.spec

diff --git a/apache-mod_cfg_ldap.spec b/apache-mod_cfg_ldap.spec
index 452226aa75174510b2f9be7c734ab65c76ce7963..fe065ad21c9f034bb7996f2fcff918e5eaf029d0 100644 (file)
--- a/apache-mod_cfg_ldap.spec
+++ b/apache-mod_cfg_ldap.spec
@@ -1,22 +1,25 @@
+%define                mod_name        cfg_ldap
 %define        apxs            /usr/sbin/apxs
 Summary:       Module to keep Apache VirtualHost configuration in an LDAP directory
 Summary(pl):   Modu³ do przechowywania konfiguracji serwerów wirtualnych Apache'a w katalogu LDAP
-%define tarname mod_cfg_ldap
-Name:          apache-%{tarname}
+Name:          apache-mod_%{mod_name}
 Version:       1.1
-Release:       1
+Release:       2
 License:       BSD
 Group:         Networking/Daemons
-Source0:       http://dl.sourceforge.net/modcfgldap/%{tarname}-%{version}.tar.gz
+Source0:       http://dl.sourceforge.net/modcfgldap/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: 42f4018277a2d3673d765d1bfd884c89
 URL:           http://modcfgldap.sourceforge.net/
 BuildRequires: %{apxs}
-BuildRequires: apache-devel
+BuildRequires: apache-devel >= 2
 BuildRequires: db-devel >= 4.2.52
 Requires(post,preun):  %{apxs}
-Requires:      apache
+Requires:      apache >= 2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+
 %description
 mod_cfg_ldap allows you to keep your virtual host configuration in a
 LDAP directory and update it in nearly realtime.
@@ -26,20 +29,17 @@ mod_cfg_ldap pozwala na przechowywanie konfiguracji host
 w katalogu LDAP i uaktualnianie jej prawie w czasie rzeczywistym.
 
 %prep
-%setup -q -n %{tarname}-%{version}
+%setup -q -n mod_%{mod_name}-%{version}
 
 %build
 %{__make} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules
-
-install -m755 .libs/%{tarname}.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
-# Install the config file
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf
-install cfg_ldap.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/85_mod_cfg_ldap.conf
+install -m755 .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install cfg_ldap.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/85_mod_cfg_ldap.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,5 +47,5 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog INSTALL README TODO
-%attr(755,root,root) %{_libdir}/httpd/modules/*.so
-%config(noreplace) %{_sysconfdir}/httpd/httpd.conf/*.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
+%config(noreplace) %{_sysconfdir}/httpd.conf/*.conf