From 9cd44081a5b4650e9c094ad7302a0f4067eb9c7a9e146cca89c62b9867e51c1e Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 5 Feb 2018 15:43:12 +0000 Subject: [PATCH 1/8] Update to last successful build e4d2aa05f92506f4d02766322f8bdd0d2e085e2b BuildRequire gpg2 as testcases need it (fixes #84) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1891 --- libzypp-17.1.2.tar.bz2 | 4 ++-- libzypp.spec | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libzypp-17.1.2.tar.bz2 b/libzypp-17.1.2.tar.bz2 index 79bd57e..d9dc153 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:5526e59035107ac544f97f2442d8fd4168fb6cbb17b6e0fc750eadc7eea1255b -size 4680888 +oid sha256:1abc8bb73b4ed04b94ead373339e034198f54d356ffe627d95d4147e25f0e906 +size 4680920 diff --git a/libzypp.spec b/libzypp.spec index 586aaf3..9048c82 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -116,8 +116,10 @@ BuildRequires: librpm-devel > 4.4 %endif %if 0%{?suse_version} +BuildRequires: gpg2 Requires: gpg2 %else +BuildRequires: gnupg2 Requires: gnupg2 %endif From 36e3f31df9ae5df671761afde16933c00b18e73e94450c6019c029b60ae4fa50 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 6 Feb 2018 16:36:36 +0000 Subject: [PATCH 2/8] Update to last successful build e54633474d1e2dd5a08f46a71d6fb680d15df37f Merge pull request #86 from bzeller/travis-build 5409ac5ab25c9ed0329f8acbed4cd5518df53fab Build and run tests in travis OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1892 --- libzypp-17.1.2.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.1.2.tar.bz2 b/libzypp-17.1.2.tar.bz2 index d9dc153..c52b19b 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:1abc8bb73b4ed04b94ead373339e034198f54d356ffe627d95d4147e25f0e906 -size 4680920 +oid sha256:3e20acc9b1592efd03b4fb09a486f6a4fcaa21c3130ea79ea409673e38f30d0c +size 4681395 From 78cc135a5d6d69e53b2f1c8f3f37c79ac54978c3aba22c5e9b72ebea63ad5c56 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 6 Feb 2018 16:48:10 +0000 Subject: [PATCH 3/8] Update to last successful build f0adb56fb53bb2f290bc48a02c76531b5833983e Merge pull request #85 from Conan-Kudo/libzypp-enable-running-tests 2ae3c38777008d9d3270f5b81d262e596572a54e Enable tests for libzypp package builds OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1893 --- libzypp-17.1.2.tar.bz2 | 4 ++-- libzypp.spec | 15 ++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/libzypp-17.1.2.tar.bz2 b/libzypp-17.1.2.tar.bz2 index c52b19b..ae56b85 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:3e20acc9b1592efd03b4fb09a486f6a4fcaa21c3130ea79ea409673e38f30d0c -size 4681395 +oid sha256:f23389eee518bb84868fa68f4c3e352403699406b9d97b7d45e4b86d4fc14576 +size 4681289 diff --git a/libzypp.spec b/libzypp.spec index 9048c82..057f41c 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -225,15 +225,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 +make -C tests %{?_smp_mflags} %install rm -rf "$RPM_BUILD_ROOT" @@ -272,6 +264,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 From 63ee3624afeadf0307ffd6011d829199e0f6f97670a82277b2c9d3a43064b5b2 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 6 Feb 2018 17:03:15 +0000 Subject: [PATCH 4/8] 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 From a2d1186c15719ecee10d92dfd18e9f3e2df28d8c7ed59d1a1a7b41bc5b10c994 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 8 Feb 2018 13:53:15 +0000 Subject: [PATCH 5/8] Update to last successful build 892f02f2a7b109ab8700154988cb1070fcf1eb07 Merge remote-tracking branch 'origin/master' 6b56da541ab3545b607fa2a4b9e47cef03abb7af Add -D_FILE_OFFSET_BITS=64 to package config Cflags OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1895 --- libzypp-17.1.2.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.1.2.tar.bz2 b/libzypp-17.1.2.tar.bz2 index 2cff806..725b32d 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:d8b0bc9238da9189e4d29d5541810e76a9c609dac43c4f9a7c7ea84a7f6c2f73 -size 4681082 +oid sha256:ec893af5de671388cda480a613a101af873e2b075541c559a0d8fb0939decb74 +size 4680634 From 151e5e22060c3f935ca4884b022a627a298d141ca59e0da4155922f79e54ea76 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 15 Feb 2018 11:38:51 +0000 Subject: [PATCH 6/8] Update to last successful build 6e46045e6798f79df632c6e30acb222b7c2b0364 Translated using Weblate (Finnish) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1896 --- libzypp-17.1.2.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.1.2.tar.bz2 b/libzypp-17.1.2.tar.bz2 index 725b32d..ceebea4 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:ec893af5de671388cda480a613a101af873e2b075541c559a0d8fb0939decb74 -size 4680634 +oid sha256:ed2b2a5652730c219efbdd424b88e3e3d0f21d9d457833577e4d2530137160c6 +size 4680469 From 1f9549544771742129ecf41f8a233ea6f58e5f9cce0190bbc17ada7ca4b2771c Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 15 Feb 2018 15:21:04 +0000 Subject: [PATCH 7/8] Update to last successful build 566e6c27769f87a4fb34daa920cc42f46f1fcb7e Merge pull request #88 from bzeller/remove-expat bdb5a71303f8b1e2e77d22624e152abac8e41dd4 Replace libexpat with libxml OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1897 --- libzypp-17.1.2.tar.bz2 | 4 ++-- libzypp.spec | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libzypp-17.1.2.tar.bz2 b/libzypp-17.1.2.tar.bz2 index ceebea4..1d91ce5 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:ed2b2a5652730c219efbdd424b88e3e3d0f21d9d457833577e4d2530137160c6 -size 4680469 +oid sha256:4a846a951ac3108da0b5bb0f64d46978cefff489a9b358d22c15dcd5d24785f6 +size 4681031 diff --git a/libzypp.spec b/libzypp.spec index ff57e49..aae35e6 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -85,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} From 0a2f06bb1816d6e45057187619d869ea84dbcd9cb9f73c3a42394a6a180d72cd Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 20 Feb 2018 17:18:57 +0000 Subject: [PATCH 8/8] Update to last successful build 1499d9d57c0689772b2230cb8575ee11dbbe6909 changes 17.1.3 (0) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1898 --- libzypp-17.1.2.tar.bz2 | 3 --- libzypp-17.1.3.tar.bz2 | 3 +++ libzypp.changes | 10 ++++++++++ libzypp.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 libzypp-17.1.2.tar.bz2 create mode 100644 libzypp-17.1.3.tar.bz2 diff --git a/libzypp-17.1.2.tar.bz2 b/libzypp-17.1.2.tar.bz2 deleted file mode 100644 index 1d91ce5..0000000 --- a/libzypp-17.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a846a951ac3108da0b5bb0f64d46978cefff489a9b358d22c15dcd5d24785f6 -size 4681031 diff --git a/libzypp-17.1.3.tar.bz2 b/libzypp-17.1.3.tar.bz2 new file mode 100644 index 0000000..686e1fe --- /dev/null +++ b/libzypp-17.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:086b1abedf3da1db2576b8d654251a4099b0ddd3f9a88c3921baf9582d698cdb +size 4681032 diff --git a/libzypp.changes b/libzypp.changes index 578c5fa..22f582b 100644 --- a/libzypp.changes +++ b/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 diff --git a/libzypp.spec b/libzypp.spec index aae35e6..32eca2e 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -17,7 +17,7 @@ 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