- fix config dir

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

diff --git a/apache-mod_dbi_pool.spec b/apache-mod_dbi_pool.spec
index f54be2ee55787dda1aef003667497451f3ded2e1..7ce522ee09d447df088477647903cf37a81502db 100644 (file)
--- a/apache-mod_dbi_pool.spec
+++ b/apache-mod_dbi_pool.spec
@@ -1,30 +1,30 @@
-

 %define                mod_name        dbi_pool
 %define        apxs            /usr/sbin/apxs
 Summary:       mod_dbi_pool - Pool Database connections between modules and requests
 %define                mod_name        dbi_pool
 %define        apxs            /usr/sbin/apxs
 Summary:       mod_dbi_pool - Pool Database connections between modules and requests

-Summary(pl):   mod_dbi_pool - po³±czenia bazowanowe miêdzy modu³ami i ¿±daniami
+Summary(pl.UTF-8):     mod_dbi_pool - połączenia bazowanowe między modułami i żądaniami

 Name:          apache-mod_%{mod_name}
 Version:       0.4.0
 Release:       1
 License:       GPL
 Name:          apache-mod_%{mod_name}
 Version:       0.4.0
 Release:       1
 License:       GPL

-Group:         Networking/Daemons
+Group:         Networking/Daemons/HTTP

 Source0:       http://www.outoforder.cc/downloads/mod_dbi_pool/mod_%{mod_name}-%{version}.tar.bz2
 # Source0-md5: 7fd42e90358b370eafdddf1f7252a65e
 URL:           http://www.outoforder.cc/projects/apache/mod_dbi_pool/
 BuildRequires: %{apxs}
 Source0:       http://www.outoforder.cc/downloads/mod_dbi_pool/mod_%{mod_name}-%{version}.tar.bz2
 # Source0-md5: 7fd42e90358b370eafdddf1f7252a65e
 URL:           http://www.outoforder.cc/projects/apache/mod_dbi_pool/
 BuildRequires: %{apxs}

+BuildRequires: apache-devel >= 2.0.40

 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: automake

-BuildRequires: apache-devel >= 2.0.40

 BuildRequires: libdbi-devel >= 0.7.2
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: libdbi-devel >= 0.7.2
 BuildRequires: libtool
 BuildRequires: pkgconfig

-BuildRequires: sed
-Requires(post,preun):  %{apxs}
-Requires:      apache >= 2.0.40
+BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: sed >= 4.0
+Requires:      apache(modules-api) = %apache_modules_api

 Requires:      libdbi >= 0.7.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 Requires:      libdbi >= 0.7.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d

 
 %description
 mod_dbi_pool provides database connection pooling services for other
 
 %description
 mod_dbi_pool provides database connection pooling services for other


@@ -32,24 +32,24 @@ Apache Modules. Using libdbi it allows other modules to have a dynamic
 pool of database connections for many common SQL Servers, including
 mSQL, MySQL, PostgreSQL, Oracle and SQLite.
 
 pool of database connections for many common SQL Servers, including
 mSQL, MySQL, PostgreSQL, Oracle and SQLite.
 

-%description -l pl
-mod_dbi_pool dostarcza us³ugi utrzymywania puli po³±czeñ z baz± danych
-dla innych modu³ów Apache'a. Poprzez u¿ycie libdbi umo¿liwia innym
-modu³om posiadanie dynamicznej puli po³±czeñ z baz± danych dla wielu
-popularnych serwerów SQL, w tym mSQL, MySQL, PostgreSQL, Oracle i
+%description -l pl.UTF-8
+mod_dbi_pool dostarcza usługi utrzymywania puli połączeń z bazą danych
+dla innych modułów Apache'a. Poprzez użycie libdbi umożliwia innym
+modułom posiadanie dynamicznej puli połączeń z bazą danych dla wielu
+popularnych serwerów SQL, w tym mSQL, MySQL, PostgreSQL, Oracle i

 SQLite.
 
 %package devel
 Summary:       Header files for mod_dbi_pool API
 SQLite.
 
 %package devel
 Summary:       Header files for mod_dbi_pool API

-Summary(pl):   Pliki nag³ówkowe dla API mod_dbi_pool
+Summary(pl.UTF-8):     Pliki nagłówkowe dla API mod_dbi_pool

 Group:         Development/Libraries
 Requires:      apache-devel >= 2.0.40
 
 %description devel
 Header files for mod_dbi_pool API.
 
 Group:         Development/Libraries
 Requires:      apache-devel >= 2.0.40
 
 %description devel
 Header files for mod_dbi_pool API.
 

-%description devel -l pl
-Pliki nag³ówkowe dla API mod_dbi_pool.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe dla API mod_dbi_pool.

 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}


@@ -60,7 +60,7 @@ Pliki nag
 %{__autoconf}
 %{__automake}
 
 %{__autoconf}
 %{__automake}
 

-sed -i -e 's/test_paths="\/usr\/lib \/usr\/local\/lib"/test_paths="\/usr\/lib64 \/usr\/lib \/usr\/local\/lib"/g' configure
+sed -i -e 's,test_paths="/usr/lib /usr/local/lib",test_paths="/usr/%{_lib} /usr/lib",g' configure

 
 %configure \
         --with-apxs=%{apxs}
 
 %configure \
         --with-apxs=%{apxs}


@@ -69,31 +69,28 @@ sed -i -e 's/test_paths="\/usr\/lib \/usr\/local\/lib"/test_paths="\/usr\/lib64
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_includedir}/apache}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_includedir}/apache,%{_sysconfdir}}

 
 install src/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
 install include/mod_dbi_pool.h $RPM_BUILD_ROOT%{_includedir}/apache
 
 install src/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
 install include/mod_dbi_pool.h $RPM_BUILD_ROOT%{_includedir}/apache

+echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
+       $RPM_BUILD_ROOT%{_sysconfdir}/75_mod_%{mod_name}.conf

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post

-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart

 
 

-%preun
+%postun

 if [ "$1" = "0" ]; then
 if [ "$1" = "0" ]; then

-       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
+       %service -q httpd restart

 fi
 
 %files
 %defattr(644,root,root,755)
 fi
 
 %files
 %defattr(644,root,root,755)

+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf

 %attr(755,root,root) %{_pkglibdir}/*.so
 
 %files devel
 %attr(755,root,root) %{_pkglibdir}/*.so
 
 %files devel