From 97abcf1aa41b39f2ed2d6979b76a0ec81dea85bf88a98a636cfa1639f905aa32 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 12 Jan 2007 00:16:59 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=4 --- apache2.changes | 5 +++++ apache2.spec | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/apache2.changes b/apache2.changes index c82b011..0d865a9 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 11 09:56:27 CET 2007 - mskibbe@suse.de + +- change path to service cml document (fate #301708) + ------------------------------------------------------------------- Tue Jan 9 15:59:42 CET 2007 - poeml@suse.de diff --git a/apache2.spec b/apache2.spec index 8f4f0c0..37fd310 100644 --- a/apache2.spec +++ b/apache2.spec @@ -54,7 +54,7 @@ License: The Apache Software License Group: Productivity/Networking/Web/Servers %define realver 2.2.4 Version: 2.2.4 -Release: 1 +Release: 3 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 Source10: SUSE-NOTICE @@ -527,8 +527,8 @@ install -m 644 $RPM_SOURCE_DIR/permissions.%{pname} $RPM_BUILD_ROOT/etc/permissi install -m 755 $RPM_SOURCE_DIR/apache2-check_forensic $RPM_BUILD_ROOT/%{_bindir}/check_forensic%{vers} # # xml stuff -install -d $RPM_BUILD_ROOT%{_sysconfdir}/omc/svcinfo.d/ -install -m 644 %{S:48} $RPM_BUILD_ROOT%{_sysconfdir}/omc/svcinfo.d/ +install -d $RPM_BUILD_ROOT%{_datadir}/omc/svcinfo.d/ +install -m 644 %{S:48} $RPM_BUILD_ROOT%{_datadir}/omc/svcinfo.d/ # # ssl stuff install -m 755 %{S:25} $RPM_BUILD_ROOT/%{_bindir}/ @@ -804,9 +804,9 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original . %dir %{sysconfdir}/vhosts.d %dir %{sysconfdir}/sysconfig.d %config(noreplace) /etc/logrotate.d/%{pname} -%dir %{_sysconfdir}/omc -%dir %{_sysconfdir}/omc/svcinfo.d/ -%{_sysconfdir}/omc/svcinfo.d/apache2.xml +%dir %{_datadir}/omc +%dir %{_datadir}/omc/svcinfo.d/ +%{_datadir}/omc/svcinfo.d/apache2.xml %if %{?suse_version:%suse_version}%{?!suse_version:9999} < 1000 %config(noreplace) /etc/permissions.d/%{pname} %endif @@ -1015,6 +1015,8 @@ if ! test -f /.buildenv; then fi %changelog -n apache2 +* Thu Jan 11 2007 - mskibbe@suse.de +- change path to service cml document (fate #301708) * Tue Jan 09 2007 - poeml@suse.de - upstream 2.2.4 mod_authnz_ldap: