From d4a6a9907c550cfc8d8a3df37c5b6391c6351809c662b465ac0c1155eb0a221b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 1 Apr 2008 21:02:11 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=18

---
 apache2.changes |  6 ++++++
 apache2.spec    | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/apache2.changes b/apache2.changes
index 8e40852..3ffc0eb 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr  1 16:05:07 CEST 2008 - mkoenig@suse.de
+
+- remove dir /usr/share/omc/svcinfo.d as it is provided now
+  by filesystem 
+
 -------------------------------------------------------------------
 Fri Mar 14 15:28:13 CET 2008 - skh@suse.de
 
diff --git a/apache2.spec b/apache2.spec
index a1cfcf6..0f120de 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -56,7 +56,7 @@ License:        The Apache Software License
 Group:          Productivity/Networking/Web/Servers
 %define realver 2.2.8
 Version:        2.2.8
-Release:        1
+Release:        8
 #Source0:      http://www.apache.org/dist/httpd-%{version}.tar.bz2
 Source0:        http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2
 Source10:       SUSE-NOTICE
@@ -170,6 +170,7 @@ Authors:
 %if %worker
 
 %package worker
+License:        The Apache Software License
 Summary:        Apache 2 worker MPM (Multi-Processing Module)
 Group:          Productivity/Networking/Web/Servers
 Provides:       %{pname}-MPM
@@ -178,6 +179,7 @@ Requires:       %{name} = %{version}
 %if %prefork
 
 %package prefork
+License:        The Apache Software License
 Summary:        Apache 2 "prefork" MPM (Multi-Processing Module)
 Group:          Productivity/Networking/Web/Servers
 Provides:       %{pname}-MPM
@@ -189,6 +191,7 @@ Requires:       %{name} = %{version}
 %if %event
 
 %package event
+License:        The Apache Software License
 Summary:        Apache 2 event MPM (Multi-Processing Module)
 Group:          Productivity/Networking/Web/Servers
 Provides:       %{pname}-MPM
@@ -249,6 +252,7 @@ Authors:
 %endif
 
 %package devel
+License:        The Apache Software License
 Summary:        Apache 2.0 Header and Include Files
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version} %{pname}-MPM
@@ -261,6 +265,7 @@ for development using the Apache API.
 
 
 %package doc
+License:        The Apache Software License
 Summary:        Additional Package Documentation.
 Group:          Documentation/Other
 %if 0%{?suse_version} >= 901 && 0%{?sles_version} != 9
@@ -275,6 +280,7 @@ this package's base documentation.
 
 
 %package example-pages
+License:        The Apache Software License
 Summary:        Example Pages for the Apache 2 Web Server
 Group:          Productivity/Networking/Web/Servers
 %if 0%{?suse_version} >= 901 && 0%{?sles_version} != 9
@@ -293,6 +299,7 @@ Authors:
     Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE
 
 %package utils
+License:        The Apache Software License
 Summary:        Apache 2 utilities
 Group:          Productivity/Networking/Web/Servers
 
@@ -809,8 +816,6 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original .
 %dir %{sysconfdir}/vhosts.d
 %dir %{sysconfdir}/sysconfig.d
 %config(noreplace) /etc/logrotate.d/%{pname}
-%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}
@@ -1026,6 +1031,9 @@ if ! test -f /.buildenv; then
 fi
 
 %changelog
+* Tue Apr 01 2008 mkoenig@suse.de
+- remove dir /usr/share/omc/svcinfo.d as it is provided now
+  by filesystem
 * Fri Mar 14 2008 skh@suse.de
 - update to upstream 2.2.8 --> see CHANGES in package for details
 - removed obsolete patches:
@@ -1089,7 +1097,7 @@ fi
 - add httpd-2.2.x.doublefree.patch, backport of
   http://svn.apache.org/viewvc?diff_format=h&view=rev&revision=496831
   See http://issues.apache.org/bugzilla/show_bug.cgi?id=39985
-* Thu Jan 18 2007 poeml@suse.de
+* Fri Jan 19 2007 poeml@suse.de
 - create debuginfo package in the buildservice
 * Fri Jan 12 2007 mskibbe@suse.de
 - change path to service cml document (fate #301708)
@@ -2753,7 +2761,7 @@ fi
 - disable httpd-2.0.36-64bit.dif
 - rename apachectl2 to apache2ctl
 - write the startup log to /var/tmp instead of /var/log/apache2
-* Sun Jan 12 2003 poeml@suse.de
+* Mon Jan 13 2003 poeml@suse.de
 - fix last fix (rpm macro before hash wasn't expanded)
 * Fri Jan 10 2003 poeml@suse.de
 - fix lib64 path in SuSEconfig