Accepting request 578616 from zypp:Head

Softwarestack update

OBS-URL: https://build.opensuse.org/request/show/578616
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=396

libzypp-17.1.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5526e59035107ac544f97f2442d8fd4168fb6cbb17b6e0fc750eadc7eea1255b
-size 4680888

libzypp-17.1.3.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:086b1abedf3da1db2576b8d654251a4099b0ddd3f9a88c3921baf9582d698cdb
+size 4681032

libzypp.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Feb 20 18:03:24 CET 2018 - ma@suse.de
+
+- RpmDb::checkPackage: fix parsing localized rpm output (bsc#1076415)
+- Replace libexpat with libxml
+- Fix libzypp tests failing with `-Wp,-D_GLIBCXX_ASSERTIONS`
+  compiler flag (fixes #84)
+- BuildRequire gpg2 as testcases need it (fixes #84)
+- version 17.1.3 (0)
+
 -------------------------------------------------------------------
 Fri Feb  2 16:07:08 CET 2018 - ma@suse.de
 

libzypp.spec

@@ -16,10 +16,8 @@
 #
 
 
-%define force_gcc_46 0
-
 Name:           libzypp
-Version:        17.1.2
+Version:        17.1.3
 Release:        0
 Url:            git://gitorious.org/opensuse/libzypp.git
 Summary:        Package, Patch, Pattern, and Product Management
@@ -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
@@ -92,12 +85,6 @@ Requires:       libsolv-tools
 # required for testsuite, webrick
 BuildRequires:  ruby
 
-%if 0%{?suse_version}
-BuildRequires:  libexpat-devel
-%else
-BuildRequires:  expat-devel
-%endif
-
 Requires:       rpm
 
 %if 0%{?suse_version}
@@ -116,8 +103,10 @@ BuildRequires:  librpm-devel > 4.4
 %endif
 
 %if 0%{?suse_version}
+BuildRequires:  gpg2
 Requires:       gpg2
 %else
+BuildRequires:  gnupg2
 Requires:       gnupg2
 %endif
 
@@ -201,10 +190,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
@@ -223,15 +208,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 make %{?_smp_mflags} VERBOSE=1
 make -C doc/autodoc %{?_smp_mflags}
 make -C po %{?_smp_mflags} translations
-
-%if 0%{?run_testsuite}
 make -C tests %{?_smp_mflags}
-  pushd tests
-  LD_LIBRARY_PATH=$PWD/../zypp:$LD_LIBRARY_PATH ctest .
-  popd
-%endif
-
-#make check
 
 %install
 rm -rf "$RPM_BUILD_ROOT"
@@ -270,6 +247,11 @@ make -C po install DESTDIR=$RPM_BUILD_ROOT
 cd ..
 %{find_lang} zypp
 
+%check
+pushd build/tests
+LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:${LD_LIBRARY_PATH} ctest .
+popd
+
 %post
 /sbin/ldconfig
 if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi