From d03a6f00244001d1fc0a38d2bb78f3b28a0ad0c9e79b6e6b71a89bb46a55cc76 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 28 Apr 2010 20:43:17 +0000
Subject: [PATCH] Accepting request 38985 from network

checked in (request 38985)

OBS-URL: https://build.opensuse.org/request/show/38985
OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=10
---
 cyrus-sasl-rc.tar.bz2        | 4 ++--
 cyrus-sasl-saslauthd.changes | 7 -------
 cyrus-sasl-saslauthd.spec    | 6 ++----
 cyrus-sasl.changes           | 7 -------
 cyrus-sasl.spec              | 3 +++
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/cyrus-sasl-rc.tar.bz2 b/cyrus-sasl-rc.tar.bz2
index 0022a87..a72aa3e 100644
--- a/cyrus-sasl-rc.tar.bz2
+++ b/cyrus-sasl-rc.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0998126ac77044b4a4e1d7154e5431e10e7bd34f871f10e48138f4e01f8149c
-size 2294
+oid sha256:5d4c1de2998c89dd10cfa49fce496b00e1f081d515638200ae35a0e66086e0a6
+size 2166
diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes
index 7b3fc82..c33f4b7 100644
--- a/cyrus-sasl-saslauthd.changes
+++ b/cyrus-sasl-saslauthd.changes
@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Wed Apr 28 09:24:11 UTC 2010 - rhafer@novell.com
-
-- Removed the /var/run/sasl2 directory from cyrus-sasl.spec. 
-  It will now be created on demand by the saslauthd init script.
-- Adjusted init script headers to silence rpmlint warning/errors.
-
 -------------------------------------------------------------------
 Mon Dec 14 17:15:20 CET 2009 - jengelh@medozas.de
 
diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec
index 063a396..cc3f572 100644
--- a/cyrus-sasl-saslauthd.spec
+++ b/cyrus-sasl-saslauthd.spec
@@ -27,7 +27,7 @@ AutoReqProv:    on
 Provides:       cyrus-sasl:/usr/sbin/saslauthd
 Provides:       cyrus-sasl2:/usr/sbin/saslauthd
 Summary:        The SASL Authentication Server
-Version: 2.1.23
+Version:        2.1.23
 Release:        4
 Source:         cyrus-sasl-%{version}.tar.bz2
 Source1:        cyrus-sasl-rc.tar.bz2
@@ -68,7 +68,7 @@ Authors:
 
 %package -n     cyrus-sasl-sqlauxprop
 License:        BSD4c(or similar)
-Summary:        SQL auxprop plugin for cyrus-sasl
+Summary:        cyrus-sasl SQL auxprop plugin
 AutoReqProv:    on
 Group:          Development/Libraries/C and C++
 Requires:       cyrus-sasl
@@ -147,7 +147,6 @@ make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install
 cd ..
 cd saslauthd
 make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install
-install -m 755 -d $RPM_BUILD_ROOT/var/run/sasl2
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 644 saslauthd.mdoc $RPM_BUILD_ROOT/%{_mandir}/man8/saslauthd.8
 mkdir -p $RPM_BUILD_ROOT/usr/bin
@@ -179,7 +178,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 /var/adm/fillup-templates/sysconfig.saslauthd
-%ghost /var/run/sasl2   
 %config /etc/init.d/saslauthd
 /sbin/rcsaslauthd
 /usr/sbin/*
diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes
index 7b3fc82..c33f4b7 100644
--- a/cyrus-sasl.changes
+++ b/cyrus-sasl.changes
@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Wed Apr 28 09:24:11 UTC 2010 - rhafer@novell.com
-
-- Removed the /var/run/sasl2 directory from cyrus-sasl.spec. 
-  It will now be created on demand by the saslauthd init script.
-- Adjusted init script headers to silence rpmlint warning/errors.
-
 -------------------------------------------------------------------
 Mon Dec 14 17:15:20 CET 2009 - jengelh@medozas.de
 
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index bb8f59d..34c012c 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -264,6 +264,7 @@ export CPPFLAGS=-I/usr/include/heimdal
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install
+install -m 755 -d $RPM_BUILD_ROOT/var/run/sasl2
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/etc/sasl2
 install -m 755 sample/.libs/client $RPM_BUILD_ROOT/usr/bin/cyrus_sasl_sample_client
@@ -293,6 +294,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libsasl2.so.*
 /usr/sbin/*
 /usr/bin/*
+%dir %attr(0755,root,root) /var/run/sasl2
+#%doc %{_mandir}/cat8
 %doc %{_mandir}/man3/sasl.*.gz
 %doc %{_mandir}/man8/*.gz
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README doc