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..dbbfce9 100644 --- a/libqb.changes +++ b/libqb.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +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 + +- spec: libqb20 provides libqb-%{version}-%{release} +- spec: add missing COPYING in libqb20 package + +------------------------------------------------------------------- +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 + +- 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..24d2c2a 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 @@ -42,30 +42,36 @@ 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 libqb0 +%package -n libqb20 Summary: An IPC library for high performance servers Group: System/Libraries -Provides: %{name} = %{version} +Provides: %{name} = %{version}-%{release} -%description -n libqb0 -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. +%description -n libqb20 +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 +Conflicts: libqb0 <= 1.0.3 + +%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} @@ -84,8 +90,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,16 +99,13 @@ 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 -%defattr(-,root,root,-) +%files -n libqb20 %doc COPYING -%{_sbindir}/qb-blackbox %{_libdir}/libqb.so.* -%{_mandir}/man8/qb-blackbox.8.gz %files devel %defattr(-,root,root,-) @@ -113,4 +115,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