From d7116240a72429e2a5a070386ea0a4152a9632ce08c887f08d5db38ed2fdb98e Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Tue, 29 Jan 2019 08:49:50 +0000 Subject: [PATCH 1/5] Accepting request 669470 from home:yan_gao:branches:network:ha-clustering:Factory:Test - Update to version 1.0.3+20190115.c880fcf: - Add Pthreads (and possibly other) flags to the pkg-config file (#332) - skiplist: Fix previous skiplist fix - Update to version 1.0.3+20181112.926e851: - log: Remove more dead code from linker callsites (#331) (bsc#1074327, bsc#1098449) - Add the option of hi-res (millisecond) timestamps (#329) - log: Add configure-time option to use systemd journal instead of syslog (#327) - log: Add option to re-open a log file (#326) - skiplist: fix use-after-free in the skiplist traversal - Update to version 1.0.3+20180927.633f262: - logging: Remove linker 'magic' and just use statics for logging callsites (#322) (bsc#1074327, bsc#1098449) - log: Use RTLD_NOOPEN when checking symbols (#310) - low customisable log line length (#292) - ipc_shm: Don't truncate SHM files of an active server (#307) OBS-URL: https://build.opensuse.org/request/show/669470 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/libqb?expand=0&rev=86 --- _servicedata | 6 ++++++ baselibs.conf | 4 ++-- libqb-1.0.3+20171226.6d62b64.tar.xz | 3 --- libqb-1.0.3+20190115.c880fcf.tar.xz | 3 +++ libqb.changes | 26 ++++++++++++++++++++++++++ libqb.spec | 20 ++++++++++---------- 6 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 _servicedata delete mode 100644 libqb-1.0.3+20171226.6d62b64.tar.xz create mode 100644 libqb-1.0.3+20190115.c880fcf.tar.xz diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..d35d735 --- /dev/null +++ b/_servicedata @@ -0,0 +1,6 @@ + + + git://github.com/ClusterLabs/libqb.git + c880fcfd8d67d707c2de8bba5099230605f0f9bc + + \ No newline at end of file diff --git a/baselibs.conf b/baselibs.conf index d32ef29..ade7604 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libqb0 +libqb20 libqb-devel requires -libqb- - requires "libqb0- = " + requires "libqb20- = " diff --git a/libqb-1.0.3+20171226.6d62b64.tar.xz b/libqb-1.0.3+20171226.6d62b64.tar.xz deleted file mode 100644 index b2e7caf..0000000 --- a/libqb-1.0.3+20171226.6d62b64.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0bd38856b1219ba2a3a14d59ede8ff2378e3bee51140380c52a96b7780a483f -size 181608 diff --git a/libqb-1.0.3+20190115.c880fcf.tar.xz b/libqb-1.0.3+20190115.c880fcf.tar.xz new file mode 100644 index 0000000..869e816 --- /dev/null +++ b/libqb-1.0.3+20190115.c880fcf.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8d446e494453c62e40be705635c8a6c45df30424257eb18e75a62368515aed0 +size 176080 diff --git a/libqb.changes b/libqb.changes index 6659221..c90b310 100644 --- a/libqb.changes +++ b/libqb.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Jan 24 13:24:10 UTC 2019 - ygao@suse.com + +- Update to version 1.0.3+20190115.c880fcf: +- Add Pthreads (and possibly other) flags to the pkg-config file (#332) +- skiplist: Fix previous skiplist fix + +------------------------------------------------------------------- +Mon Nov 12 16:35:19 UTC 2018 - ygao@suse.com + +- Update to version 1.0.3+20181112.926e851: +- log: Remove more dead code from linker callsites (#331) (bsc#1074327, bsc#1098449) +- Add the option of hi-res (millisecond) timestamps (#329) +- log: Add configure-time option to use systemd journal instead of syslog (#327) +- log: Add option to re-open a log file (#326) +- skiplist: fix use-after-free in the skiplist traversal + +------------------------------------------------------------------- +Mon Oct 1 14:57:23 UTC 2018 - ygao@suse.com + +- Update to version 1.0.3+20180927.633f262: +- logging: Remove linker 'magic' and just use statics for logging callsites (#322) (bsc#1074327, bsc#1098449) +- log: Use RTLD_NOOPEN when checking symbols (#310) +- low customisable log line length (#292) +- ipc_shm: Don't truncate SHM files of an active server (#307) + ------------------------------------------------------------------- Tue Jan 2 10:08:14 UTC 2018 - ygao@suse.com diff --git a/libqb.spec b/libqb.spec index 34e390c..441539b 100644 --- a/libqb.spec +++ b/libqb.spec @@ -1,7 +1,7 @@ # # spec file for package libqb # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,10 +19,10 @@ %bcond_without check Name: libqb -Version: 1.0.3+20171226.6d62b64 +Version: 1.0.3+20190115.c880fcf Release: 0 Summary: An IPC library for high performance servers -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Url: https://github.com/ClusterLabs/libqb Source0: %{name}-%{version}.tar.xz @@ -46,12 +46,13 @@ libqb is a library with the primary purpose of providing high performance client server reusable features. It provides high performance logging, tracing, ipc, and poll. -%package -n libqb0 +%package -n libqb20 Summary: An IPC library for high performance servers Group: System/Libraries Provides: %{name} = %{version} +Obsoletes: libqb0 -%description -n libqb0 +%description -n libqb20 libqb is a library with the primary purpose of providing high performance client server reusable features. It provides high performance logging, tracing, ipc, and poll. @@ -84,8 +85,7 @@ make %{?_smp_mflags} # "osc build" in a chroot fails. if [ -w /dev/shm -a -w /var/run ] ; then - make V=1 check \ - && make -C tests/functional/log_internal V=1 check + make V=1 check fi %endif @@ -94,11 +94,11 @@ fi find %{buildroot} -name '*.la' -delete rm -rf %{buildroot}%{_datadir}/doc -%post -n libqb0 -p /sbin/ldconfig +%post -n libqb20 -p /sbin/ldconfig -%postun -n libqb0 -p /sbin/ldconfig +%postun -n libqb20 -p /sbin/ldconfig -%files -n libqb0 +%files -n libqb20 %defattr(-,root,root,-) %doc COPYING %{_sbindir}/qb-blackbox From e6bf71d2bd8c4f89da1d7e7bbf88a6efbd1d341586734fce99074d8f72b0d507 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Tue, 29 Jan 2019 14:31:45 +0000 Subject: [PATCH 2/5] Accepting request 669840 from home:jengelh:branches:network:ha-clustering:Factory - Trim filler wording from descriptions. Remove unnecesary pkgconfig Requires (automatically discovered). - Split non-library parts of libqb20 into libqb-tools. OBS-URL: https://build.opensuse.org/request/show/669840 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/libqb?expand=0&rev=87 --- libqb.changes | 7 +++++++ libqb.spec | 37 ++++++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/libqb.changes b/libqb.changes index c90b310..a90bf74 100644 --- a/libqb.changes +++ b/libqb.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 29 12:21:19 UTC 2019 - Jan Engelhardt + +- Trim filler wording from descriptions. Remove unnecesary + pkgconfig Requires (automatically discovered). +- Split non-library parts of libqb20 into libqb-tools. + ------------------------------------------------------------------- Thu Jan 24 13:24:10 UTC 2019 - ygao@suse.com diff --git a/libqb.spec b/libqb.spec index 441539b..e599eb2 100644 --- a/libqb.spec +++ b/libqb.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -42,9 +42,8 @@ BuildRequires: procps #BuildRequires: git %description -libqb is a library with the primary purpose of providing high performance -client server reusable features. It provides high performance logging, -tracing, ipc, and poll. +libqb is a library providing high performance client server reusable +features. It provides logging, tracing, IPC, and polling. %package -n libqb20 Summary: An IPC library for high performance servers @@ -53,20 +52,26 @@ Provides: %{name} = %{version} Obsoletes: libqb0 %description -n libqb20 -libqb is a library with the primary purpose of providing high performance -client server reusable features. It provides high performance logging, -tracing, ipc, and poll. +libqb is a library providing high performance client server reusable +features. It provides logging, tracing, IPC, and polling. %package devel Summary: Development files for %{name} Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} -Requires: pkgconfig %description devel -libqb is a library with the primary purpose of providing high performance -client server reusable features. It provides high performance logging, -tracing, ipc, and poll. +libqb is a library providing high performance client server reusable +features. It provides logging, tracing, IPC, and polling. + +%package tools +Summary: Utilities from libqb, an IPC library +Group: Development/Tools/Other +Provides: libqb0:/usr/sbin/qb-blackbox + +%description tools +libqb is a library providing high performance client server reusable +features. It provides logging, tracing, IPC, and polling. %prep %setup -q -n %{name}-%{version} @@ -99,11 +104,7 @@ rm -rf %{buildroot}%{_datadir}/doc %postun -n libqb20 -p /sbin/ldconfig %files -n libqb20 -%defattr(-,root,root,-) -%doc COPYING -%{_sbindir}/qb-blackbox %{_libdir}/libqb.so.* -%{_mandir}/man8/qb-blackbox.8.gz %files devel %defattr(-,root,root,-) @@ -113,4 +114,10 @@ rm -rf %{buildroot}%{_datadir}/doc %{_libdir}/pkgconfig/libqb.pc %{_mandir}/man3/qb*3* +%files tools +%defattr(-,root,root,-) +%doc COPYING +%{_sbindir}/qb-blackbox +%{_mandir}/man8/qb-blackbox.8.gz + %changelog From a6df153be230e0c8af5bae5f052500529ad76ea31fa0e0bcf296c9283e30e202 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Tue, 29 Jan 2019 14:47:16 +0000 Subject: [PATCH 3/5] Accepting request 669881 from home:yan_gao:branches:network:ha-clustering:Factory OBS-URL: https://build.opensuse.org/request/show/669881 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/libqb?expand=0&rev=88 --- libqb.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libqb.spec b/libqb.spec index e599eb2..a6a02ea 100644 --- a/libqb.spec +++ b/libqb.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -49,7 +49,6 @@ features. It provides logging, tracing, IPC, and polling. Summary: An IPC library for high performance servers Group: System/Libraries Provides: %{name} = %{version} -Obsoletes: libqb0 %description -n libqb20 libqb is a library providing high performance client server reusable From 337d596255ed7e2c694258ac75c260315621c3d8747b6b724fe6a87ba55cbefc Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Tue, 29 Jan 2019 16:48:13 +0000 Subject: [PATCH 4/5] Accepting request 669928 from home:yan_gao:branches:network:ha-clustering:Factory - spec: libqb20 provides libqb-%{version}-%{release} - spec: add missing COPYING in libqb20 package OBS-URL: https://build.opensuse.org/request/show/669928 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/libqb?expand=0&rev=89 --- libqb.changes | 6 ++++++ libqb.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libqb.changes b/libqb.changes index a90bf74..9fa1084 100644 --- a/libqb.changes +++ b/libqb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 29 16:34:09 UTC 2019 - ygao@suse.com + +- spec: libqb20 provides libqb-%{version}-%{release} +- spec: add missing COPYING in libqb20 package + ------------------------------------------------------------------- Tue Jan 29 12:21:19 UTC 2019 - Jan Engelhardt diff --git a/libqb.spec b/libqb.spec index a6a02ea..dd07e39 100644 --- a/libqb.spec +++ b/libqb.spec @@ -48,7 +48,7 @@ features. It provides logging, tracing, IPC, and polling. %package -n libqb20 Summary: An IPC library for high performance servers Group: System/Libraries -Provides: %{name} = %{version} +Provides: %{name} = %{version}-%{release} %description -n libqb20 libqb is a library providing high performance client server reusable @@ -103,6 +103,7 @@ rm -rf %{buildroot}%{_datadir}/doc %postun -n libqb20 -p /sbin/ldconfig %files -n libqb20 +%doc COPYING %{_libdir}/libqb.so.* %files devel From 7476660502c370afbeaed5d6a2d416985884e665be2cf224a65dbae2580a3604 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Thu, 7 Feb 2019 16:58:37 +0000 Subject: [PATCH 5/5] Accepting request 672520 from home:yan_gao:branches:network:ha-clustering:Factory - spec: libqb-tools conflicts with libqb0 <= 1.0.3 OBS-URL: https://build.opensuse.org/request/show/672520 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/libqb?expand=0&rev=90 --- libqb.changes | 5 +++++ libqb.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/libqb.changes b/libqb.changes index 9fa1084..dbbfce9 100644 --- a/libqb.changes +++ b/libqb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 7 16:48:54 UTC 2019 - ygao@suse.com + +- spec: libqb-tools conflicts with libqb0 <= 1.0.3 + ------------------------------------------------------------------- Tue Jan 29 16:34:09 UTC 2019 - ygao@suse.com diff --git a/libqb.spec b/libqb.spec index dd07e39..24d2c2a 100644 --- a/libqb.spec +++ b/libqb.spec @@ -67,6 +67,7 @@ features. It provides logging, tracing, IPC, and polling. Summary: Utilities from libqb, an IPC library Group: Development/Tools/Other Provides: libqb0:/usr/sbin/qb-blackbox +Conflicts: libqb0 <= 1.0.3 %description tools libqb is a library providing high performance client server reusable