- backport changes made by darix

diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index 0f0229d63417670c298a1c8fd5830812b7453504..9c225c9e24c74e80dff95717ff72f3b77a2d3a15 100644 (file)
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+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
 

diff --git a/package/libsatsolver.spec.in b/package/libsatsolver.spec.in
index 3d404cf6eb2dc14e524ce3d2769bce72394de76c..5ee4daad7356aa9db4cd5a681132c2dfe7718646 100644 (file)
--- 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