From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 28 Jun 2012 12:48:40 +0000 (+0200)
Subject: Merge branch 'master' into dbus
X-Git-Tag: v0.1.3~219
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a6154cbd9fa6125b3166e66685bf207e164f293;p=thirdparty%2Fsnapper.git

Merge branch 'master' into dbus
---

3a6154cbd9fa6125b3166e66685bf207e164f293
diff --cc snapper.spec.in
index b0a7140e,3e45e424..7a921ae7
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@@ -27,13 -27,9 +27,10 @@@ Patch1:		no-readonly.dif
  Prefix:		/usr
  BuildRequires:	boost-devel doxygen gcc-c++ libtool libxml2-devel
  BuildRequires:	python-devel swig
 +BuildRequires:  dbus-1-devel
- %if 0%{?suse_version}
- BuildRequires:	libblocxx-devel
- %if 0%{?suse_version} >= 1210
+ %if (0%{?suse_version} && 0%{?suse_version} >= 1210)
  BuildRequires:	libzypp(plugin:commit)
  %endif
- %endif
  Requires:	libsnapper@LIBVERSION_MAJOR@ = %version
  %if 0%{?suse_version}
  Recommends:	cron logrotate snapper-zypp-plugin