[rpms/gnome-user-share] wip/oholy/f45-update: - Patch config for apache 2.2

[rpms/gnome-user-share] wip/oholy/f45-update: - Patch config for apache 2.2

[Alexander Larsson]

A new commit has been pushed.

Repo   : rpms/gnome-user-share
Branch : wip/oholy/f45-update
Commit : 4d7761924cd498ce66670d5e871ce12065f8265a
Author : Alexander Larsson <alexl@fedoraproject.org>
Date   : 2006-02-03T14:45:53+00:00
Stats  : +32/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/gnome-user-share/c/4d7761924cd498ce66670d5e871ce12065f8265a?branch=wip/oholy/f45-update

Log:
- Patch config for apache 2.2

---
diff --git a/gnome-user-share-httpd-2.2.patch b/gnome-user-share-httpd-2.2.patch
new file mode 100644
index 0000000..3e4d1a0
--- /dev/null
+++ b/gnome-user-share-httpd-2.2.patch
@@ -0,0 +1,23 @@
+Migrate to httpd 2.2 configuration.
+
+--- dav_user.conf	2005-12-11 05:01:41.000000000 -0500
++++ dav_user.conf	2006-01-27 17:49:27.000000000 -0500
+@@ -10,6 +10,7 @@
+ 
+ LoadModule dav_module /etc/httpd/modules/mod_dav.so
+ LoadModule dav_fs_module /etc/httpd/modules/mod_dav_fs.so
++LoadModule authn_file_module /etc/httpd/modules/mod_authn_file.so
+ LoadModule auth_digest_module /etc/httpd/modules/mod_auth_digest.so
+ 
+ DocumentRoot ${HOME}/Public
+@@ -20,7 +21,9 @@
+   AuthType Digest
+   AuthName "Please log in as the user guest"
+   AuthDigestDomain /
+-  AuthDigestFile ${HOME}/.gnome2/user-share/passwd
++
++  AuthDigestProvider file
++  AuthUserFile ${HOME}/.gnome2/user-share/passwd
+ 
+ 
+   <IfDefine RequirePasswordAlways>

diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index 2987844..3f651e1 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -1,22 +1,27 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.9
-Release: 1.1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.gz
+Patch1: gnome-user-share-httpd-2.2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: httpd
 BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
 BuildRequires: desktop-file-utils
 Prereq: GConf2
 
+# Config file format changed for 2.2.0 (patch1)
+Conflicts: httpd < 2.2.0
+
 %description
 gnome-user-share 
 
 %prep
 %setup -q
+%patch1 -p0  -b .httpd-2.2
 
 %build
 %configure
@@ -57,6 +62,9 @@ done
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Feb  3 2006 Alexander Larsson <alexl@redhat.com> 0.9-2
+- Patch config for apache 2.2
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt