From 5fbfa0aa28f475aaf84e59d9a814c0bcfec1c2ee5f4033b416daa6d4a26b19da Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 29 Jul 2012 11:41:58 +0000
Subject: [PATCH] Accepting request 129146 from
 home:AndreasStieger:rsyslog:v6-stable

- update to 6.2.2 [V6-stable] 2012-06-13
  http://www.rsyslog.com/changelog-for-6-2-2-v6-stable/
- add rsyslog-6.2.2-link-libestr.patch to correctly link against
  libestr

OBS-URL: https://build.opensuse.org/request/show/129146
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=86
---
 rsyslog-5.8.12.tar.gz            |  3 ---
 rsyslog-6.2.2-link-libestr.patch | 13 +++++++++++++
 rsyslog-6.2.2.tar.gz             |  3 +++
 rsyslog.changes                  |  8 ++++++++
 rsyslog.spec                     |  6 +++++-
 5 files changed, 29 insertions(+), 4 deletions(-)
 delete mode 100644 rsyslog-5.8.12.tar.gz
 create mode 100644 rsyslog-6.2.2-link-libestr.patch
 create mode 100644 rsyslog-6.2.2.tar.gz

diff --git a/rsyslog-5.8.12.tar.gz b/rsyslog-5.8.12.tar.gz
deleted file mode 100644
index a8f2fe9..0000000
--- a/rsyslog-5.8.12.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18a408c92fa299773d26a8d6f324eec66282a148b0989c66d94b94318dd0a514
-size 2393679
diff --git a/rsyslog-6.2.2-link-libestr.patch b/rsyslog-6.2.2-link-libestr.patch
new file mode 100644
index 0000000..31ed77e
--- /dev/null
+++ b/rsyslog-6.2.2-link-libestr.patch
@@ -0,0 +1,13 @@
+Index: tools/Makefile.in
+===================================================================
+--- tools/Makefile.in.orig	2012-06-13 14:58:20.000000000 +0100
++++ tools/Makefile.in	2012-07-03 20:51:33.000000000 +0100
+@@ -339,7 +339,7 @@ rsyslogd_SOURCES = \
+ 	../dirty.h
+ 
+ rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
+-rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS)
++rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBESTR_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS)
+ rsyslogd_LDFLAGS = -export-dynamic
+ @ENABLE_DIAGTOOLS_TRUE@rsyslog_diag_hostname_SOURCES = gethostn.c
+ @ENABLE_DIAGTOOLS_TRUE@zpipe_SOURCES = zpipe.c
diff --git a/rsyslog-6.2.2.tar.gz b/rsyslog-6.2.2.tar.gz
new file mode 100644
index 0000000..bedf194
--- /dev/null
+++ b/rsyslog-6.2.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c54b51f9f26d16e623d664c765268f3696721ceddfbee4e76b0dd89f04a6f471
+size 2432745
diff --git a/rsyslog.changes b/rsyslog.changes
index c32fe01..befc46d 100644
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul  3 19:58:13 UTC 2012 - andreas.stieger@gmx.de
+
+- update to 6.2.2 [V6-stable] 2012-06-13
+  http://www.rsyslog.com/changelog-for-6-2-2-v6-stable/
+- add rsyslog-6.2.2-link-libestr.patch to correctly link against
+  libestr
+
 -------------------------------------------------------------------
 Sun Jul  1 16:39:21 UTC 2012 - andreas.stieger@gmx.de
 
diff --git a/rsyslog.spec b/rsyslog.spec
index 99350e1..c43190d 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -20,7 +20,7 @@ Name:           rsyslog
 Summary:        The enhanced syslogd for Linux and Unix
 License:        GPL-3.0+
 Group:          System/Daemons
-Version:        5.8.12
+Version:        6.2.2
 Release:        0
 # for setting those bcond_with* configs see
 # http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/
@@ -110,12 +110,15 @@ BuildRequires:  systemd-devel
 BuildRequires:  systemd
 %endif
 %endif
+BuildRequires:  pkgconfig(libee) >= 0.3.1
+BuildRequires:  pkgconfig(libestr) >= 0.1.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        http://www.rsyslog.com/files/download/%{name}/%{name}-%{upstream_version}.tar.gz
 Source1:        rsyslog.sysconfig
 Source2:        rsyslog.conf.in
 Source3:        rsyslog.early.conf.in
 Source4:        rsyslog.d.remote.conf.in
+Patch0:         rsyslog-6.2.2-link-libestr.patch
 
 %description
 Rsyslog is an enhanced multi-threaded syslogd supporting, among others,
@@ -266,6 +269,7 @@ This module provides a UDP forwarder that allows changing the sender address.
 
 %prep
 %setup -q -n %{name}-%{upstream_version}
+%patch0 -p0
 %if %{with systemd}
 %if 0%{?suse_version} <= 1140
 # Bug: https://bugzilla.novell.com/show_bug.cgi?id=656259