From 2f6fa61ee7bb4e12ea848306156ca06263adb718bfeb1ec72e3331b5713cb942 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Wed, 17 Sep 2014 11:47:17 +0000 Subject: [PATCH 01/10] Update to last successful build d1528e758e56690e44f33cf4d86219137f01f2d6 changes 14.29.1 (29) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1127 --- libzypp-14.29.0.tar.bz2 | 3 --- libzypp-14.29.1.tar.bz2 | 3 +++ libzypp.changes | 9 +++++++++ libzypp.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 libzypp-14.29.0.tar.bz2 create mode 100644 libzypp-14.29.1.tar.bz2 diff --git a/libzypp-14.29.0.tar.bz2 b/libzypp-14.29.0.tar.bz2 deleted file mode 100644 index c38f0ba..0000000 --- a/libzypp-14.29.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:334a81569381cb06190f26afaf597de90fd43276d2d01c3e401efc0360161127 -size 4605605 diff --git a/libzypp-14.29.1.tar.bz2 b/libzypp-14.29.1.tar.bz2 new file mode 100644 index 0000000..f9ee90c --- /dev/null +++ b/libzypp-14.29.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:189d3bde12c33b9405f1a04f0e481a4f3efe583725f3b0072461d7e731501fcd +size 4606067 diff --git a/libzypp.changes b/libzypp.changes index 22e5bc2..10ef3ac 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,6 +1,15 @@ +------------------------------------------------------------------- +Wed Sep 17 13:18:23 CEST 2014 - ma@suse.de + +- adjust BuildRequires +- version 14.29.1 (29) + ------------------------------------------------------------------- Tue Sep 16 10:45:39 CEST 2014 - ma@suse.de +- DiskUsageCounter: Set growonly on detetcted snapshotting btrfs + partitions (bnc#896176) +- DiskUsageCounter: Allow MountPoint to store fstype - DiskUsageCounter: Support setting 'growonly' partition hint (bnc#896176) - version 14.29.0 (29) diff --git a/libzypp.spec b/libzypp.spec index 27ab45a..8779aee 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management License: GPL-2.0+ Group: System/Packages -Version: 14.29.0 +Version: 14.29.1 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc From 3fc54302e29fa86bf55fb61514e2f94878646901e215734c16a51224a408c384 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 18 Sep 2014 13:47:38 +0000 Subject: [PATCH 02/10] Update to last successful build 329360e581a1282e82e0440a75d4d1338ff7787e SLE-12 (suse_version 1315) uses it's own translations set (bnc#897176) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1128 --- libzypp-14.29.1.tar.bz2 | 4 ++-- libzypp.spec | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libzypp-14.29.1.tar.bz2 b/libzypp-14.29.1.tar.bz2 index f9ee90c..32a9de3 100644 --- a/libzypp-14.29.1.tar.bz2 +++ b/libzypp-14.29.1.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:189d3bde12c33b9405f1a04f0e481a4f3efe583725f3b0072461d7e731501fcd -size 4606067 +oid sha256:0610041c809381f05a07c05881a8974c8a4ce76d6a11c9b7c82a030adaeeadb1 +size 4434616 diff --git a/libzypp.spec b/libzypp.spec index 8779aee..6715b20 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -209,13 +209,20 @@ export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" unset TRANSLATION_SET unset EXTRA_CMAKE_OPTIONS -# SLE11-* might want its own translation set: -%if 0%{?suse_version} == 1110 ++# Same codebase, but SLES may use it's own translation set. ++# suse_version ++# 1110 SLES11 ++# 1315 SLES12 +%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315 if [ -f ../po/sle-zypp-po.tar.bz ]; then export TRANSLATION_SET=sle-zypp - export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON" fi %endif +# No libproxy on SLE11 +%if 0%{?suse_version} == 1110 +export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON" +%endif + cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DDOC_INSTALL_DIR=%{_docdir} \ -DLIB=%{_lib} \ From 5af86369fb65a878f98cc37c96b9f67fcff0f4a91d336571a1fb57615dfd2d74 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 18 Sep 2014 14:02:40 +0000 Subject: [PATCH 03/10] Update to last successful build 40cbd6f07f336bae23c36fbe906af08bf21c1002 Update sle-zypp-po.tar.bz2 OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1129 --- libzypp-14.29.1.tar.bz2 | 4 ++-- libzypp.changes | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libzypp-14.29.1.tar.bz2 b/libzypp-14.29.1.tar.bz2 index 32a9de3..fb26582 100644 --- a/libzypp-14.29.1.tar.bz2 +++ b/libzypp-14.29.1.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0610041c809381f05a07c05881a8974c8a4ce76d6a11c9b7c82a030adaeeadb1 -size 4434616 +oid sha256:64757faf78fafdb70a780680812b0c2a8d9275715a3bd64107ad3eaccc5e242d +size 4988446 diff --git a/libzypp.changes b/libzypp.changes index 10ef3ac..dd15df1 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Sep 18 15:47:50 CEST 2014 - ma@suse.de + +- Update sle-zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Sep 18 15:47:34 CEST 2014 - ma@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Sep 18 15:46:11 CEST 2014 - ma@suse.de + +- Update zypp-po.tar.bz2 + ------------------------------------------------------------------- Wed Sep 17 13:18:23 CEST 2014 - ma@suse.de From ba49a1ad892cc84ede38907f035686a846332ac279025cb0c94e867e48bcaa92 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Sat, 20 Sep 2014 23:31:45 +0000 Subject: [PATCH 04/10] Update to last successful build 4a3c86b5e0d417dff037853194d5c5333069b20e Update zypp-po.tar.bz2 OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1130 --- libzypp-14.29.1.tar.bz2 | 4 ++-- libzypp.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libzypp-14.29.1.tar.bz2 b/libzypp-14.29.1.tar.bz2 index fb26582..4c4a3fa 100644 --- a/libzypp-14.29.1.tar.bz2 +++ b/libzypp-14.29.1.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64757faf78fafdb70a780680812b0c2a8d9275715a3bd64107ad3eaccc5e242d -size 4988446 +oid sha256:bb37c5e859f516809d6917aafa1abe073f4e803c8021e195881ddfb47b4d9da6 +size 4992622 diff --git a/libzypp.changes b/libzypp.changes index dd15df1..5488955 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Sep 21 01:13:25 CEST 2014 - ma@suse.de + +- Update zypp-po.tar.bz2 + ------------------------------------------------------------------- Thu Sep 18 15:47:50 CEST 2014 - ma@suse.de From 55d92c7e7a77314e975b17e93a411e77795d3cb31c38247a9a4990ea90a6c579 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 22 Sep 2014 12:38:45 +0000 Subject: [PATCH 05/10] Update to last successful build e6982194dd7e7d1521c52dec5508a22e188da257 Adapt to API changes in rpm.4.12 OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1131 --- libzypp-14.29.1.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-14.29.1.tar.bz2 b/libzypp-14.29.1.tar.bz2 index 4c4a3fa..5e3d440 100644 --- a/libzypp-14.29.1.tar.bz2 +++ b/libzypp-14.29.1.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb37c5e859f516809d6917aafa1abe073f4e803c8021e195881ddfb47b4d9da6 -size 4992622 +oid sha256:6bf2f4cb2c3d86c32d67d01ceea50a834f446c88fc91dfce7b15643114f941cd +size 4992736 From 6a67b6f832be62fed97e6bfd2a8026234103d6097e19d706d55eec0a843c73b7 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 23 Sep 2014 09:10:38 +0000 Subject: [PATCH 06/10] Update to last successful build b05bc62dceaf680d32308a1e6c966b86ff5798d7 changes 14.29.2 (29) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1132 --- libzypp-14.29.1.tar.bz2 | 3 --- libzypp-14.29.2.tar.bz2 | 3 +++ libzypp.changes | 8 ++++++++ libzypp.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 libzypp-14.29.1.tar.bz2 create mode 100644 libzypp-14.29.2.tar.bz2 diff --git a/libzypp-14.29.1.tar.bz2 b/libzypp-14.29.1.tar.bz2 deleted file mode 100644 index 5e3d440..0000000 --- a/libzypp-14.29.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6bf2f4cb2c3d86c32d67d01ceea50a834f446c88fc91dfce7b15643114f941cd -size 4992736 diff --git a/libzypp-14.29.2.tar.bz2 b/libzypp-14.29.2.tar.bz2 new file mode 100644 index 0000000..74b592c --- /dev/null +++ b/libzypp-14.29.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e4d4b342bd81e363f1dc1e14294a5fb2f50a2b838e325172456d5f718247feb +size 4993049 diff --git a/libzypp.changes b/libzypp.changes index 5488955..7bcfa7f 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Sep 23 10:55:08 CEST 2014 - ma@suse.de + +- Adapt to API changes in rpm.4.12 +- SLE-12 (suse_version 1315) uses it's own translations set + (bnc#897176) +- version 14.29.2 (29) + ------------------------------------------------------------------- Sun Sep 21 01:13:25 CEST 2014 - ma@suse.de diff --git a/libzypp.spec b/libzypp.spec index 6715b20..f992ca3 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management License: GPL-2.0+ Group: System/Packages -Version: 14.29.1 +Version: 14.29.2 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc From ab830bf9f35d325e2c34bda02ee4d5326cef8aef6b2db3c3ba75158f543f0c0e Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 23 Sep 2014 15:30:55 +0000 Subject: [PATCH 07/10] Update to last successful build bc6f57cab5b79985998c04f909ba7acdbb323807 Fix spec file comment OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1133 --- libzypp-14.29.2.tar.bz2 | 3 --- libzypp-14.29.3.tar.bz2 | 3 +++ libzypp.changes | 6 ++++++ libzypp.spec | 10 +++++----- 4 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 libzypp-14.29.2.tar.bz2 create mode 100644 libzypp-14.29.3.tar.bz2 diff --git a/libzypp-14.29.2.tar.bz2 b/libzypp-14.29.2.tar.bz2 deleted file mode 100644 index 74b592c..0000000 --- a/libzypp-14.29.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e4d4b342bd81e363f1dc1e14294a5fb2f50a2b838e325172456d5f718247feb -size 4993049 diff --git a/libzypp-14.29.3.tar.bz2 b/libzypp-14.29.3.tar.bz2 new file mode 100644 index 0000000..955ea85 --- /dev/null +++ b/libzypp-14.29.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c896e93d6851d7500d583d41aedb7789cdef35c1e3858dff5f31104c879d931a +size 4993284 diff --git a/libzypp.changes b/libzypp.changes index 7bcfa7f..fdf2e31 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 23 17:07:45 CEST 2014 - ma@suse.de + +- Fix computation of userinstalled items (bnc#897404) +- version 14.29.3 (29) + ------------------------------------------------------------------- Tue Sep 23 10:55:08 CEST 2014 - ma@suse.de diff --git a/libzypp.spec b/libzypp.spec index f992ca3..a1953dd 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management License: GPL-2.0+ Group: System/Packages -Version: 14.29.2 +Version: 14.29.3 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc @@ -209,10 +209,10 @@ export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" unset TRANSLATION_SET unset EXTRA_CMAKE_OPTIONS -+# Same codebase, but SLES may use it's own translation set. -+# suse_version -+# 1110 SLES11 -+# 1315 SLES12 +# Same codebase, but SLES may use it's own translation set. +# suse_version +# 1110 SLES11 +# 1315 SLES12 %if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315 if [ -f ../po/sle-zypp-po.tar.bz ]; then export TRANSLATION_SET=sle-zypp From aff229e3c40672a17a6bf90ab8144a44e79f784157b1cf773897bf533a3d0028 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Wed, 24 Sep 2014 14:07:07 +0000 Subject: [PATCH 08/10] Update to last successful build 153fcf4d686b891ed90062dd7eb85372b74720ef BuildRequire libsolv-tools as libsolv-devel no longer does OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1134 --- libzypp-14.29.3.tar.bz2 | 4 ++-- libzypp.spec | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libzypp-14.29.3.tar.bz2 b/libzypp-14.29.3.tar.bz2 index 955ea85..e09c6f4 100644 --- a/libzypp-14.29.3.tar.bz2 +++ b/libzypp-14.29.3.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c896e93d6851d7500d583d41aedb7789cdef35c1e3858dff5f31104c879d931a -size 4993284 +oid sha256:d76982e9d5caf64c7543e895c3b250dab374b6f2d6dddc274afed488c06bf151 +size 4993121 diff --git a/libzypp.spec b/libzypp.spec index a1953dd..61f81e4 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -75,6 +75,7 @@ BuildRequires: pkg-config BuildRequires: libsolv-devel >= 0.6.5 %if 0%{?suse_version} >= 1100 +BuildRequires: libsolv-tools %requires_eq libsolv-tools %else Requires: libsolv-tools From c53f3e9a8a2f2cf2efb3c5411fd72fef996a10651d572d331bd65a6e97ea53d6 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Wed, 24 Sep 2014 23:30:56 +0000 Subject: [PATCH 09/10] Update to last successful build db6b476425d00e94d17fe86ba3308375d142355d Update zypp-po.tar.bz2 OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1135 --- libzypp-14.29.3.tar.bz2 | 4 ++-- libzypp.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libzypp-14.29.3.tar.bz2 b/libzypp-14.29.3.tar.bz2 index e09c6f4..12ba468 100644 --- a/libzypp-14.29.3.tar.bz2 +++ b/libzypp-14.29.3.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d76982e9d5caf64c7543e895c3b250dab374b6f2d6dddc274afed488c06bf151 -size 4993121 +oid sha256:b25f72c138c62ab035524ab42fc4fa167852191d7030ec6cde429ef27acdc445 +size 4993306 diff --git a/libzypp.changes b/libzypp.changes index fdf2e31..1b87193 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 25 01:15:42 CEST 2014 - ma@suse.de + +- Update zypp-po.tar.bz2 + ------------------------------------------------------------------- Tue Sep 23 17:07:45 CEST 2014 - ma@suse.de From 8745f315f4929f38ab37157be6937c244c3f0b200b322586948cda8ba34b5941 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 25 Sep 2014 16:16:12 +0000 Subject: [PATCH 10/10] Update to last successful build d61a05bcaa55404a6a7b5a116bb10564df827f1b changes 14.29.4 (29) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1136 --- libzypp-14.29.3.tar.bz2 | 3 --- libzypp-14.29.4.tar.bz2 | 3 +++ libzypp.changes | 8 ++++++++ libzypp.spec | 4 +++- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 libzypp-14.29.3.tar.bz2 create mode 100644 libzypp-14.29.4.tar.bz2 diff --git a/libzypp-14.29.3.tar.bz2 b/libzypp-14.29.3.tar.bz2 deleted file mode 100644 index 12ba468..0000000 --- a/libzypp-14.29.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b25f72c138c62ab035524ab42fc4fa167852191d7030ec6cde429ef27acdc445 -size 4993306 diff --git a/libzypp-14.29.4.tar.bz2 b/libzypp-14.29.4.tar.bz2 new file mode 100644 index 0000000..1791d5f --- /dev/null +++ b/libzypp-14.29.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4067e74aa3ec29e6cd98803b43e91a957c8e2d28176fc646ce2bfab751056d6 +size 4994179 diff --git a/libzypp.changes b/libzypp.changes index 1b87193..c6b8267 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 25 17:59:06 CEST 2014 - ma@suse.de + +- Trigger appdata plugin when system repos have changed (bnc#866257) +- Protect against race when destructing globals +- BuildRequire libsolv-tools as libsolv-devel no longer does +- version 14.29.4 (29) + ------------------------------------------------------------------- Thu Sep 25 01:15:42 CEST 2014 - ma@suse.de diff --git a/libzypp.spec b/libzypp.spec index 61f81e4..be0562d 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management License: GPL-2.0+ Group: System/Packages -Version: 14.29.3 +Version: 14.29.4 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc @@ -32,6 +32,7 @@ Obsoletes: yast2-packagemanager # Features we provide (update doc/autoinclude/FeatureTest.doc): Provides: libzypp(plugin) = 0 +Provides: libzypp(plugin:appdata) = 0 Provides: libzypp(plugin:commit) = 1 Provides: libzypp(plugin:services) = 0 Provides: libzypp(plugin:system) = 0 @@ -260,6 +261,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vendors.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/multiversion.d mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/appdata mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/commit mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/services mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/system