From b472c23ce1d09d8cd60f2b3d9acc714d369f28299c86e523b3e4990335f89edd Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Sat, 17 May 2014 10:01:46 +0000 Subject: [PATCH] clean the diff a bit OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=184 --- rsyslog.spec | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/rsyslog.spec b/rsyslog.spec index 460cc64..d578d2f 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -88,7 +88,6 @@ BuildRequires: klogd %endif BuildRequires: bison BuildRequires: flex -BuildRequires: dos2unix BuildRequires: openssl-devel >= 0.9.7 BuildRequires: pcre-devel BuildRequires: pkgconfig @@ -135,11 +134,7 @@ BuildRequires: postgresql-devel %endif %if %{with relp} # RELP support -%if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(relp) >= 1.2.5 -%else -BuildRequires: librelp-devel >= 1.2.5 -%endif %endif %if %{with udpspoof} # UDP spoof support @@ -147,24 +142,15 @@ BuildRequires: libnet-devel %endif %if %{with mmnormalize} # mmnormalize support -BuildRequires: pkgconfig(lognorm) >= 1.0.0 -%if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(libee) >= 0.4.0 -%else -BuildRequires: libee-devel >= 0.4.0 -%endif # >= 1210 +BuildRequires: pkgconfig(lognorm) >= 1.0.0 %endif # with mmnormalize # # mmjsonparse needs liblognorm, # but json check is unconditional -BuildRequires: libee-devel -BuildRequires: libestr-devel >= 0.1.9 -BuildRequires: libjson-devel -%if 0%{?suse_version} >= 1220 -BuildRequires: pkgconfig(uuid) >= 2.21.0 -%else -BuildRequires: libuuid-devel -%endif +BuildRequires: pkgconfig(json) >= 0.9 +BuildRequires: pkgconfig(libee) >= 0.4.0 +BuildRequires: pkgconfig(libestr) >= 0.1.9 %if 0%{?suse_version} >= 1200 BuildRequires: python-docutils %bcond_without rst2man