packages: apache-mod_annodex/apache-mod_annodex.spec, apache-mod_auth_any/a...
glen
glen at pld-linux.org
Fri Dec 9 13:06:27 CET 2011
Author: glen Date: Fri Dec 9 12:06:27 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fix config dir
---- Files affected:
packages/apache-mod_annodex:
apache-mod_annodex.spec (1.6 -> 1.7)
packages/apache-mod_auth_any:
apache-mod_auth_any.spec (1.40 -> 1.41)
packages/apache-mod_auth_mysql:
apache-mod_auth_mysql.spec (1.46 -> 1.47)
packages/apache-mod_auth_pgsql:
apache-mod_auth_pgsql.spec (1.38 -> 1.39)
packages/apache-mod_auth_shadow:
apache-mod_auth_shadow.spec (1.20 -> 1.21)
packages/apache-mod_authn_pam:
apache-mod_authn_pam.spec (1.6 -> 1.7)
packages/apache-mod_authn_sasl:
apache-mod_authn_sasl.spec (1.4 -> 1.5)
packages/apache-mod_bt:
apache-mod_bt.spec (1.13 -> 1.14)
packages/apache-mod_caml:
apache-mod_caml.spec (1.14 -> 1.15)
packages/apache-mod_chroot:
apache-mod_chroot.spec (1.10 -> 1.11)
packages/apache-mod_clamav:
apache-mod_clamav.spec (1.19 -> 1.20)
packages/apache-mod_cvs:
apache-mod_cvs.spec (1.32 -> 1.33)
packages/apache-mod_dbi_pool:
apache-mod_dbi_pool.spec (1.17 -> 1.18)
packages/apache-mod_encoding:
apache-mod_encoding.spec (1.7 -> 1.8)
packages/apache-mod_epp:
apache-mod_epp.spec (1.15 -> 1.16)
packages/apache-mod_evasive:
apache-mod_evasive.spec (1.3 -> 1.4)
packages/apache-mod_gzip:
apache-mod_gzip.spec (1.41 -> 1.42)
packages/apache-mod_log_sql:
apache-mod_log_sql.spec (1.25 -> 1.26)
packages/apache-mod_midgard:
apache-mod_midgard.spec (1.38 -> 1.39)
packages/apache-mod_ntlm:
apache-mod_ntlm.spec (1.27 -> 1.28)
packages/apache-mod_proctitle:
apache-mod_proctitle.spec (1.3 -> 1.4)
packages/apache-mod_roaming:
apache-mod_roaming.spec (1.32 -> 1.33)
packages/apache-mod_ruby:
apache-mod_ruby.spec (1.27 -> 1.28)
packages/apache-mod_suid2:
apache-mod_suid2.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: packages/apache-mod_annodex/apache-mod_annodex.spec
diff -u packages/apache-mod_annodex/apache-mod_annodex.spec:1.6 packages/apache-mod_annodex/apache-mod_annodex.spec:1.7
--- packages/apache-mod_annodex/apache-mod_annodex.spec:1.6 Sat Oct 25 17:50:01 2008
+++ packages/apache-mod_annodex/apache-mod_annodex.spec Fri Dec 9 13:06:22 2011
@@ -21,7 +21,7 @@
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
@@ -61,11 +61,10 @@
%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
@@ -81,7 +80,7 @@
%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
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -90,6 +89,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2011/12/09 12:06:22 glen
+- fix config dir
+
Revision 1.6 2008/10/25 15:50:01 blues
- HTTP group
================================================================
Index: packages/apache-mod_auth_any/apache-mod_auth_any.spec
diff -u packages/apache-mod_auth_any/apache-mod_auth_any.spec:1.40 packages/apache-mod_auth_any/apache-mod_auth_any.spec:1.41
--- packages/apache-mod_auth_any/apache-mod_auth_any.spec:1.40 Sat Oct 25 17:50:01 2008
+++ packages/apache-mod_auth_any/apache-mod_auth_any.spec Fri Dec 9 13:06:22 2011
@@ -29,7 +29,7 @@
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
This module allows you to use any command line program (such as
@@ -79,15 +79,16 @@
%patch0 -p1
%build
-%{__make} APXS2=/usr/sbin/apxs
+%{__make} \
+ APXS2=/usr/sbin/apxs
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
-install src/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p src/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
- $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -103,7 +104,7 @@
%files
%defattr(644,root,root,755)
%doc docs/* TODO
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -112,6 +113,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.41 2011/12/09 12:06:22 glen
+- fix config dir
+
Revision 1.40 2008/10/25 15:50:01 blues
- HTTP group
================================================================
Index: packages/apache-mod_auth_mysql/apache-mod_auth_mysql.spec
diff -u packages/apache-mod_auth_mysql/apache-mod_auth_mysql.spec:1.46 packages/apache-mod_auth_mysql/apache-mod_auth_mysql.spec:1.47
--- packages/apache-mod_auth_mysql/apache-mod_auth_mysql.spec:1.46 Mon Feb 16 10:34:33 2009
+++ packages/apache-mod_auth_mysql/apache-mod_auth_mysql.spec Fri Dec 9 13:06:22 2011
@@ -37,7 +37,7 @@
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
This is an authentication module for Apache that allows you to
@@ -93,6 +93,7 @@
%{__aclocal}
%{__autoconf}
%configure \
+ --disable-static \
--disable-apache13 \
--enable-apache2 \
--with-apxs2=%{apxs} \
@@ -101,13 +102,13 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
libtool install apache2_mod_%{mod_name}.la $RPM_BUILD_ROOT%{_pkglibdir}
rm -f $RPM_BUILD_ROOT%{_pkglibdir}/*.{l,}a
echo 'LoadModule %{mod_name}_module modules/apache2_mod_%{mod_name}.so' > \
- $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -123,7 +124,7 @@
%files
%defattr(644,root,root,755)
%doc DIRECTIVES USAGE
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -132,6 +133,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2011/12/09 12:06:22 glen
+- fix config dir
+
Revision 1.46 2009/02/16 09:34:33 blues
- security blocker added
================================================================
Index: packages/apache-mod_auth_pgsql/apache-mod_auth_pgsql.spec
diff -u packages/apache-mod_auth_pgsql/apache-mod_auth_pgsql.spec:1.38 packages/apache-mod_auth_pgsql/apache-mod_auth_pgsql.spec:1.39
--- packages/apache-mod_auth_pgsql/apache-mod_auth_pgsql.spec:1.38 Sat Oct 25 17:50:01 2008
+++ packages/apache-mod_auth_pgsql/apache-mod_auth_pgsql.spec Fri Dec 9 13:06:22 2011
@@ -31,7 +31,7 @@
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
This is an authentication module for Apache that allows you to
@@ -92,10 +92,10 @@
%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_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/52_mod_auth_pgsql.conf
+install -p .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/52_mod_auth_pgsql.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -111,7 +111,7 @@
%files
%defattr(644,root,root,755)
%doc *.html
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth_pgsql.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_auth_pgsql.conf
%attr(755,root,root) %{_pkglibdir}/*.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -120,6 +120,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.39 2011/12/09 12:06:22 glen
+- fix config dir
+
Revision 1.38 2008/10/25 15:50:01 blues
- HTTP group
================================================================
Index: packages/apache-mod_auth_shadow/apache-mod_auth_shadow.spec
diff -u packages/apache-mod_auth_shadow/apache-mod_auth_shadow.spec:1.20 packages/apache-mod_auth_shadow/apache-mod_auth_shadow.spec:1.21
--- packages/apache-mod_auth_shadow/apache-mod_auth_shadow.spec:1.20 Fri May 14 23:16:19 2010
+++ packages/apache-mod_auth_shadow/apache-mod_auth_shadow.spec Fri Dec 9 13:06:23 2011
@@ -20,7 +20,7 @@
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_auth_shadow is an Apache module for authenticating users via an
@@ -62,12 +62,13 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sbindir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sbindir},%{_sysconfdir}}
-install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install validate $RPM_BUILD_ROOT%{_sbindir}
+install -p .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+# XXX: too generic name
+install -p validate $RPM_BUILD_ROOT%{_sbindir}
echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
- $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -83,7 +84,7 @@
%files
%defattr(644,root,root,755)
%doc CHANGES INSTALL README
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*.so
%attr(4755,root,root) %{_sbindir}/validate
@@ -93,6 +94,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21 2011/12/09 12:06:23 glen
+- fix config dir
+
Revision 1.20 2010/05/14 21:16:19 sparky
- fixed source dir name
================================================================
Index: packages/apache-mod_authn_pam/apache-mod_authn_pam.spec
diff -u packages/apache-mod_authn_pam/apache-mod_authn_pam.spec:1.6 packages/apache-mod_authn_pam/apache-mod_authn_pam.spec:1.7
--- packages/apache-mod_authn_pam/apache-mod_authn_pam.spec:1.6 Sun Feb 6 18:35:28 2011
+++ packages/apache-mod_authn_pam/apache-mod_authn_pam.spec Fri Dec 9 13:06:23 2011
@@ -27,7 +27,7 @@
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
This is an authentication module for Apache that allows you to
@@ -54,12 +54,12 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/pam.d,%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/pam.d,%{_sysconfdir}}
cd src
-install .libs/mod_*.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/52_mod_authn_pam.conf
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/httpd
+install -p .libs/mod_*.so $RPM_BUILD_ROOT%{_pkglibdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/52_mod_authn_pam.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/httpd
%clean
rm -rf $RPM_BUILD_ROOT
@@ -74,7 +74,7 @@
%files
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_authn_pam.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_authn_pam.conf
%attr(755,root,root) %{_pkglibdir}/*.so
%config(noreplace) /etc/pam.d/httpd
@@ -84,6 +84,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2011/12/09 12:06:23 glen
+- fix config dir
+
Revision 1.6 2011/02/06 17:35:28 sparky
- %install should begin with rm -rf $RPM_BUILD_ROOT; unified %install a little
================================================================
Index: packages/apache-mod_authn_sasl/apache-mod_authn_sasl.spec
diff -u packages/apache-mod_authn_sasl/apache-mod_authn_sasl.spec:1.4 packages/apache-mod_authn_sasl/apache-mod_authn_sasl.spec:1.5
--- packages/apache-mod_authn_sasl/apache-mod_authn_sasl.spec:1.4 Sun Dec 28 05:19:38 2008
+++ packages/apache-mod_authn_sasl/apache-mod_authn_sasl.spec Fri Dec 9 13:06:23 2011
@@ -18,7 +18,7 @@
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
This module allows you to use SASL to authenticate a user.
@@ -34,11 +34,11 @@
%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_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
- $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -53,7 +53,7 @@
%files
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -62,6 +62,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2011/12/09 12:06:23 glen
+- fix config dir
+
Revision 1.4 2008/12/28 04:19:38 aredridel
- 1.0.2
- fixed missing library (Built, but caused errors on load)
================================================================
Index: packages/apache-mod_bt/apache-mod_bt.spec
diff -u packages/apache-mod_bt/apache-mod_bt.spec:1.13 packages/apache-mod_bt/apache-mod_bt.spec:1.14
--- packages/apache-mod_bt/apache-mod_bt.spec:1.13 Sat Oct 25 17:50:01 2008
+++ packages/apache-mod_bt/apache-mod_bt.spec Fri Dec 9 13:06:23 2011
@@ -21,7 +21,7 @@
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
Apache-based BitTorrent Tracker.
@@ -38,11 +38,11 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
- $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -58,7 +58,7 @@
%files
%defattr(644,root,root,755)
%doc README
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -67,6 +67,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2011/12/09 12:06:23 glen
+- fix config dir
+
Revision 1.13 2008/10/25 15:50:01 blues
- HTTP group
================================================================
Index: packages/apache-mod_caml/apache-mod_caml.spec
diff -u packages/apache-mod_caml/apache-mod_caml.spec:1.14 packages/apache-mod_caml/apache-mod_caml.spec:1.15
--- packages/apache-mod_caml/apache-mod_caml.spec:1.14 Sat Oct 25 17:50:01 2008
+++ packages/apache-mod_caml/apache-mod_caml.spec Fri Dec 9 13:06:24 2011
@@ -27,7 +27,7 @@
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
# I don't understand it but it is neccessary if one strips
# it, it won't work. Help welcome.
@@ -70,7 +70,6 @@
%install
rm -rf $RPM_BUILD_ROOT
-
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -88,7 +87,7 @@
%files
%defattr(644,root,root,755)
%doc COPYING.LIB CHANGES README examples html icons modcaml-example.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*.so
%{_libdir}/ocaml
%{_datadir}/%{mod_name}
@@ -99,6 +98,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2011/12/09 12:06:24 glen
+- fix config dir
+
Revision 1.14 2008/10/25 15:50:01 blues
- HTTP group
================================================================
Index: packages/apache-mod_chroot/apache-mod_chroot.spec
diff -u packages/apache-mod_chroot/apache-mod_chroot.spec:1.10 packages/apache-mod_chroot/apache-mod_chroot.spec:1.11
--- packages/apache-mod_chroot/apache-mod_chroot.spec:1.10 Sat Oct 25 17:50:01 2008
+++ packages/apache-mod_chroot/apache-mod_chroot.spec Fri Dec 9 13:06:24 2011
@@ -18,7 +18,7 @@
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_chroot makes running Apache in a secure chroot environment easy.
@@ -38,11 +38,11 @@
%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_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
- $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -58,7 +58,7 @@
%files
%defattr(644,root,root,755)
%doc CAVEATS ChangeLog INSTALL README
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -67,6 +67,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2011/12/09 12:06:24 glen
+- fix config dir
+
Revision 1.10 2008/10/25 15:50:01 blues
- HTTP group
================================================================
Index: packages/apache-mod_clamav/apache-mod_clamav.spec
diff -u packages/apache-mod_clamav/apache-mod_clamav.spec:1.19 packages/apache-mod_clamav/apache-mod_clamav.spec:1.20
--- packages/apache-mod_clamav/apache-mod_clamav.spec:1.19 Sat Oct 25 17:50:01 2008
+++ packages/apache-mod_clamav/apache-mod_clamav.spec Fri Dec 9 13:06:24 2011
@@ -30,7 +30,7 @@
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_clamav is an Apache 2 filter which scans the content delivered by
@@ -59,10 +59,10 @@
%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_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/32_mod_clamav.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/32_mod_clamav.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -78,7 +78,7 @@
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog mod_clamav.html NEWS README TODO
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -87,6 +87,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2011/12/09 12:06:24 glen
+- fix config dir
+
Revision 1.19 2008/10/25 15:50:01 blues
- HTTP group
================================================================
Index: packages/apache-mod_cvs/apache-mod_cvs.spec
diff -u packages/apache-mod_cvs/apache-mod_cvs.spec:1.32 packages/apache-mod_cvs/apache-mod_cvs.spec:1.33
--- packages/apache-mod_cvs/apache-mod_cvs.spec:1.32 Sat Oct 25 17:50:01 2008
+++ packages/apache-mod_cvs/apache-mod_cvs.spec Fri Dec 9 13:06:24 2011
@@ -20,7 +20,7 @@
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
Apache module: Automatically updates files in a CVS-based webtree.
@@ -36,12 +36,12 @@
%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_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
- $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -57,7 +57,7 @@
%files
%defattr(644,root,root,755)
%doc README doc/*.html
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -66,6 +66,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.33 2011/12/09 12:06:24 glen
+- fix config dir
+
Revision 1.32 2008/10/25 15:50:01 blues
- HTTP group
================================================================
Index: packages/apache-mod_dbi_pool/apache-mod_dbi_pool.spec
diff -u packages/apache-mod_dbi_pool/apache-mod_dbi_pool.spec:1.17 packages/apache-mod_dbi_pool/apache-mod_dbi_pool.spec:1.18
--- packages/apache-mod_dbi_pool/apache-mod_dbi_pool.spec:1.17 Sat Oct 25 17:50:01 2008
+++ packages/apache-mod_dbi_pool/apache-mod_dbi_pool.spec Fri Dec 9 13:06:24 2011
@@ -25,7 +25,7 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
-%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_annodex/apache-mod_annodex.spec?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_auth_any/apache-mod_auth_any.spec?r1=1.40&r2=1.41&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_auth_mysql/apache-mod_auth_mysql.spec?r1=1.46&r2=1.47&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_auth_pgsql/apache-mod_auth_pgsql.spec?r1=1.38&r2=1.39&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_auth_shadow/apache-mod_auth_shadow.spec?r1=1.20&r2=1.21&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_authn_pam/apache-mod_authn_pam.spec?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_authn_sasl/apache-mod_authn_sasl.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_bt/apache-mod_bt.spec?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_caml/apache-mod_caml.spec?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_chroot/apache-mod_chroot.spec?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_clamav/apache-mod_clamav.spec?r1=1.19&r2=1.20&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_cvs/apache-mod_cvs.spec?r1=1.32&r2=1.33&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_dbi_pool/apache-mod_dbi_pool.spec?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_encoding/apache-mod_encoding.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_epp/apache-mod_epp.spec?r1=1.15&r2=1.16&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_evasive/apache-mod_evasive.spec?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_gzip/apache-mod_gzip.spec?r1=1.41&r2=1.42&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_log_sql/apache-mod_log_sql.spec?r1=1.25&r2=1.26&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_midgard/apache-mod_midgard.spec?r1=1.38&r2=1.39&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_ntlm/apache-mod_ntlm.spec?r1=1.27&r2=1.28&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_proctitle/apache-mod_proctitle.spec?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_roaming/apache-mod_roaming.spec?r1=1.32&r2=1.33&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_ruby/apache-mod_ruby.spec?r1=1.27&r2=1.28&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_suid2/apache-mod_suid2.spec?r1=1.14&r2=1.15&f=u
More information about the pld-cvs-commit
mailing list