From: Michael Schroeder <mls@suse.de>
Date: Thu, 23 Oct 2008 08:51:49 +0000 (+0000)
Subject: - backport changes made by darix
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~424
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f86f32618e595547a319e567bc4a551abb6af286;p=platform%2Fupstream%2Flibsolv.git

- backport changes made by darix
---

diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index 0f0229d..9c225c9 100644
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Thu Oct 23 10:49:40 CEST 2008 - mrueckert@suse.de
+
+- add zlib-devel as buildrequires, cmake is looking for it
+  explicitely. rpm-devel used to require it but you dont really
+  need it to link against librpm*
+- requires rpm-devel in the devel package, it is required to link
+  against libsatsolver.
+
+-------------------------------------------------------------------
 Wed Oct 22 13:00:56 CEST 2008 - mls@suse.de
 
 - add pool_set_installed()
diff --git a/package/libsatsolver.spec.in b/package/libsatsolver.spec.in
index 3d404cf..5ee4daa 100644
--- a/package/libsatsolver.spec.in
+++ b/package/libsatsolver.spec.in
@@ -11,17 +11,18 @@ Prefix:         /usr
 
 %if 0%{?mandriva_version}
 # force this version on mandriva
-BuildRequires: libneon0.26-devel
+BuildRequires:  libneon0.26-devel
 %endif
 %if 0%{?fedora_version}
-BuildRequires: perl-devel
+BuildRequires:  perl-devel
 %endif
 %if 0%{?suse_version}
-BuildRequires: libexpat-devel
+BuildRequires:  libexpat-devel
 %else
-BuildRequires: expat-devel
+BuildRequires:  expat-devel
 %endif
 BuildRequires:  cmake rpm-devel gcc-c++ ruby-devel swig perl python-devel
+BuildRequires:  zlib-devel
 # the testsuite uses the check framework
 BuildRequires:  check-devel
 Summary:        A new approach to package dependency solving
@@ -38,6 +39,7 @@ Authors:
 Summary:        A new approach to package dependency solving
 Group:          Development/Libraries/C and C++
 Requires:       satsolver-tools = %version
+Requires:       rpm-devel
 
 %description devel
 A new approach to package dependency solving