Mailinglist Archive: zypp-commit (233 mails)

< Previous Next >
[zypp-commit] <libzypp> master : specfile fixes for sle11-sp1
  • From: Michael Andres <ma@xxxxxxx>
  • Date: Mon, 16 Nov 2009 16:27:16 +0100
  • Message-id: <E1NA3Wa-0002Ha-BR@xxxxxxxxxxxxxxxx>
ref: refs/heads/master
commit 1a3f81376c5fdbee4d37636c4f1e084f4247ea40
Author: Michael Andres <ma@xxxxxxx>
Date: Mon Nov 16 16:27:16 2009 +0100

specfile fixes for sle11-sp1
---
libzypp.spec.cmake | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index d2cbaeb..2cafe26 100644
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -25,13 +25,14 @@ Provides: yast2-packagemanager
Obsoletes: yast2-packagemanager
Recommends: logrotate
BuildRequires: cmake
-BuildRequires: libsatsolver-devel >= 0.14.9
BuildRequires: openssl-devel
BuildRequires: boost-devel dejagnu doxygen gcc-c++ gettext-devel graphviz
hal-devel libxml2-devel

+BuildRequires: libsatsolver-devel >= 0.14.9
+%requires_eq satsolver-tools
+
# required for testsuite, webrick
BuildRequires: ruby
-BuildRequires: aria2 >= 1.1.2

%if 0%{?suse_version}
BuildRequires: libexpat-devel
@@ -61,14 +62,27 @@ Requires: gpg2
Requires: gnupg
%endif

-%requires_eq satsolver-tools
+# ---------------------------------------------------------------
+%if 0%{?suse_version} == 1110
+# (almost) common codebase, but on SLES11-SP1 (according to Rudi
+# suse_version == 1110) we have a patched libcurl-7.19.0-11.22,
+# and no aria2.
+%define min_curl_version 7.19.0-11.22
+# ---------------------------------------------------------------
+%else
+# ---------------------------------------------------------------
+# This is 11.2 (better not sles11-sp1)
# need CURLOPT_REDIR_PROTOCOLS:
%define min_curl_version 7.19.4
+# want aria2:
+Requires: aria2 >= 1.1.2
+BuildRequires: aria2 >= 1.1.2
+%endif
+# ---------------------------------------------------------------
+
Requires: libcurl4 >= %{min_curl_version}
BuildRequires: libcurl-devel >= %{min_curl_version}

-Requires: aria2 >= 1.1.2
-
%description
Package, Patch, Pattern, and Product Management

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages