From 63ee3624afeadf0307ffd6011d829199e0f6f97670a82277b2c9d3a43064b5b2 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 6 Feb 2018 17:03:15 +0000 Subject: [PATCH] Update to last successful build 59ab754f3846ca316d25b12f8763d81e6a8e91d5 spec file: clear force_gcc_46 switch OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1894 --- libzypp-17.1.2.tar.bz2 | 4 ++-- libzypp.spec | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/libzypp-17.1.2.tar.bz2 b/libzypp-17.1.2.tar.bz2 index ae56b85..2cff806 100644 --- a/libzypp-17.1.2.tar.bz2 +++ b/libzypp-17.1.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f23389eee518bb84868fa68f4c3e352403699406b9d97b7d45e4b86d4fc14576 -size 4681289 +oid sha256:d8b0bc9238da9189e4d29d5541810e76a9c609dac43c4f9a7c7ea84a7f6c2f73 +size 4681082 diff --git a/libzypp.spec b/libzypp.spec index 057f41c..ff57e49 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -16,8 +16,6 @@ # -%define force_gcc_46 0 - Name: libzypp Version: 17.1.2 Release: 0 @@ -61,12 +59,7 @@ BuildRequires: boost-devel %endif BuildRequires: dejagnu BuildRequires: doxygen -%if 0%{?force_gcc_46} -BuildRequires: gcc46 -BuildRequires: gcc46-c++ -%else BuildRequires: gcc-c++ >= 4.6 -%endif BuildRequires: gettext-devel BuildRequires: graphviz BuildRequires: libxml2-devel @@ -203,10 +196,6 @@ Package, Patch, Pattern, and Product Management - developers files %build mkdir build cd build -%if 0%{?force_gcc_46} -export CC=gcc-4.6 -export CXX=g++-4.6 -%endif export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" unset EXTRA_CMAKE_OPTIONS