packages: apache-mod_transform/apache-mod_transform.spec, apache-mod_vhost_...

glen glen at pld-linux.org
Fri Dec 9 13:06:32 CET 2011 

Author: glen                         Date: Fri Dec  9 12:06:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix config dir

---- Files affected:
packages/apache-mod_transform:
   apache-mod_transform.spec (1.23 -> 1.24) 
packages/apache-mod_vhost_dbi:
   apache-mod_vhost_dbi.spec (1.12 -> 1.13) 
packages/apache-mod_vhost_mysql:
   apache-mod_vhost_mysql.spec (1.25 -> 1.26) 
packages/apache-mod_whois:
   apache-mod_whois.spec (1.13 -> 1.14) 
packages/apache-mod_xsendfile:
   apache-mod_xsendfile.spec (1.9 -> 1.10) 
packages/apache-mod_xslt2:
   apache-mod_xslt2.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: packages/apache-mod_transform/apache-mod_transform.spec
diff -u packages/apache-mod_transform/apache-mod_transform.spec:1.23 packages/apache-mod_transform/apache-mod_transform.spec:1.24
--- packages/apache-mod_transform/apache-mod_transform.spec:1.23	Mon Feb  9 22:07:18 2009
+++ packages/apache-mod_transform/apache-mod_transform.spec	Fri Dec  9 13:06:27 2011
@@ -25,7 +25,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_transform is a filter module that allows Apache 2.0 to do dynamic
@@ -54,10 +54,10 @@
 
 %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/libmod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/61_mod_transform.conf
+install -p src/.libs/libmod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/61_mod_transform.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,7 +73,7 @@
 %files
 %defattr(644,root,root,755)
 %doc 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"`)
@@ -82,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2011/12/09 12:06:27  glen
+- fix config dir
+
 Revision 1.23  2009/02/09 21:07:18  duddits
 - up to 0.6.0
 

================================================================
Index: packages/apache-mod_vhost_dbi/apache-mod_vhost_dbi.spec
diff -u packages/apache-mod_vhost_dbi/apache-mod_vhost_dbi.spec:1.12 packages/apache-mod_vhost_dbi/apache-mod_vhost_dbi.spec:1.13
--- packages/apache-mod_vhost_dbi/apache-mod_vhost_dbi.spec:1.12	Sat Oct 25 17:50:03 2008
+++ packages/apache-mod_vhost_dbi/apache-mod_vhost_dbi.spec	Fri Dec  9 13:06:27 2011
@@ -25,7 +25,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_vhost_dbi creates virtual hosts for Apache 2.0 completely
@@ -55,11 +55,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_includedir}/apache,%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_includedir}/apache,%{_sysconfdir}}
 
-install src/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p src/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
-	$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/79_mod_%{mod_name}.conf
+	$RPM_BUILD_ROOT%{_sysconfdir}/79_mod_%{mod_name}.conf
 
 %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_%{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"`)
@@ -83,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2011/12/09 12:06:27  glen
+- fix config dir
+
 Revision 1.12  2008/10/25 15:50:03  blues
 - HTTP group
 

================================================================
Index: packages/apache-mod_vhost_mysql/apache-mod_vhost_mysql.spec
diff -u packages/apache-mod_vhost_mysql/apache-mod_vhost_mysql.spec:1.25 packages/apache-mod_vhost_mysql/apache-mod_vhost_mysql.spec:1.26
--- packages/apache-mod_vhost_mysql/apache-mod_vhost_mysql.spec:1.25	Sat Oct 25 17:50:03 2008
+++ packages/apache-mod_vhost_mysql/apache-mod_vhost_mysql.spec	Fri Dec  9 13:06:27 2011
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_with	publichtml	# enable search of public_html in home taken from mysql
-#
+
 %define		mod_name	vhost_mysql
 %define		apxs		/usr/sbin/apxs
 Summary:	Apache vhost in MySQL
@@ -15,18 +15,17 @@
 Source0:	http://fabienne.tc2.utelisys.net/~skinkie/mod_vhost_mysql2/mod_%{mod_name}2-%{version}.tar.gz
 # Source0-md5:	c47c8dc4ac41e9ed2c91a239c876d272
 Source1:	apache_vhost_mysql.conf
-Patch0:		mod_%{mod_name}2-publichtml.patch		
+Patch0:		mod_%{mod_name}2-publichtml.patch
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0
 BuildRequires:	db-devel >= 4.2.52
 BuildRequires:	mysql-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
-Requires:	rc-scripts
 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 provides dynamically configured virtual hosting using
@@ -40,7 +39,7 @@
 %setup -q -n mod_%{mod_name}2-%{version}
 rm -rf .libs *.{la,lo,o,slo}
 %if %{with publichtml}
-%patch -p1
+%patch0 -p1
 %endif
 
 %build
@@ -49,10 +48,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/21_vhost_mysql.conf
+install -p .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/21_vhost_mysql.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,7 +67,7 @@
 %files
 %defattr(644,root,root,755)
 %doc README vh.sql
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_vhost_mysql.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_vhost_mysql.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -77,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2011/12/09 12:06:27  glen
+- fix config dir
+
 Revision 1.25  2008/10/25 15:50:03  blues
 - HTTP group
 

================================================================
Index: packages/apache-mod_whois/apache-mod_whois.spec
diff -u packages/apache-mod_whois/apache-mod_whois.spec:1.13 packages/apache-mod_whois/apache-mod_whois.spec:1.14
--- packages/apache-mod_whois/apache-mod_whois.spec:1.13	Sat Oct 25 17:50:03 2008
+++ packages/apache-mod_whois/apache-mod_whois.spec	Fri Dec  9 13:06:28 2011
@@ -19,7 +19,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: WHOIS->WEB gateway.
@@ -35,10 +35,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd.conf,%{_pkglibdir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_pkglibdir}}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/83_mod_%{mod_name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/83_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,7 +54,7 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE 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"`)
@@ -63,6 +63,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2011/12/09 12:06:28  glen
+- fix config dir
+
 Revision 1.13  2008/10/25 15:50:03  blues
 - HTTP group
 

================================================================
Index: packages/apache-mod_xsendfile/apache-mod_xsendfile.spec
diff -u packages/apache-mod_xsendfile/apache-mod_xsendfile.spec:1.9 packages/apache-mod_xsendfile/apache-mod_xsendfile.spec:1.10
--- packages/apache-mod_xsendfile/apache-mod_xsendfile.spec:1.9	Sat Oct 25 17:50:03 2008
+++ packages/apache-mod_xsendfile/apache-mod_xsendfile.spec	Fri Dec  9 13:06:28 2011
@@ -18,8 +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		_pkglogdir	%(%{apxs} -q PREFIX 2>/dev/null)/logs
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 mod_xsendfile is a small Apache2 module that processes X-SENDFILE
@@ -48,10 +47,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
-install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
+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
@@ -67,7 +66,7 @@
 %files
 %defattr(644,root,root,755)
 %doc Readme.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}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -76,6 +75,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2011/12/09 12:06:28  glen
+- fix config dir
+
 Revision 1.9  2008/10/25 15:50:03  blues
 - HTTP group
 

================================================================
Index: packages/apache-mod_xslt2/apache-mod_xslt2.spec
diff -u packages/apache-mod_xslt2/apache-mod_xslt2.spec:1.19 packages/apache-mod_xslt2/apache-mod_xslt2.spec:1.20
--- packages/apache-mod_xslt2/apache-mod_xslt2.spec:1.19	Sat Oct 25 17:50:03 2008
+++ packages/apache-mod_xslt2/apache-mod_xslt2.spec	Fri Dec  9 13:06:28 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
 mod_xslt is a simple Apache module to serve XML based content. Data is
@@ -87,12 +87,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/70_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -109,7 +109,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
 %attr(755,root,root) %{_libdir}/libmodxslt0.so.*.*.*
 
@@ -129,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2011/12/09 12:06:28  glen
+- fix config dir
+
 Revision 1.19  2008/10/25 15:50:03  blues
 - HTTP group
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_transform/apache-mod_transform.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_vhost_dbi/apache-mod_vhost_dbi.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_vhost_mysql/apache-mod_vhost_mysql.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_whois/apache-mod_whois.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_xsendfile/apache-mod_xsendfile.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_xslt2/apache-mod_xslt2.spec?r1=1.19&r2=1.20&f=u

More information about the pld-cvs-commit mailing list