From d5951467e048cde27c8aa7e9b4456306ff8982bce0104b9616c3858522a2fa4e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 19 Nov 2021 18:23:32 +0000 Subject: [PATCH 1/4] Accepting request 932581 from home:iznogood:branches:server:monitoring - Fold main package into devel package, as it needed its own devel-package, add a protobuf-c = version Provides to devel sub-package. OBS-URL: https://build.opensuse.org/request/show/932581 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/protobuf-c?expand=0&rev=32 --- protobuf-c.changes | 7 +++++++ protobuf-c.spec | 10 ++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/protobuf-c.changes b/protobuf-c.changes index 285fc0c..f70cb3d 100644 --- a/protobuf-c.changes +++ b/protobuf-c.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 19 17:38:59 UTC 2021 - Bjørn Lie + +- Fold main package into devel package, as it needed its own + devel-package, add a protobuf-c = version Provides to devel + sub-package. + ------------------------------------------------------------------- Wed May 19 07:24:48 UTC 2021 - Jan Engelhardt diff --git a/protobuf-c.spec b/protobuf-c.spec index c30c614..2efea98 100644 --- a/protobuf-c.spec +++ b/protobuf-c.spec @@ -35,7 +35,6 @@ BuildRequires: libtool BuildRequires: make BuildRequires: pkgconfig BuildRequires: protobuf-devel >= 2.6.0 -Requires: libprotobuf-c-devel = %version %description This package provides a code generator and runtime libraries to use Protocol @@ -55,6 +54,7 @@ Buffers from pure C (not C++). Summary: C bindings for Google's Protocol Buffers Group: Development/Libraries/C and C++ Requires: libprotobuf-c%sover = %version +Provides: %{name} = %version %description -n libprotobuf-c-devel This package provides a code generator and runtime libraries to use Protocol @@ -76,17 +76,15 @@ rm "%buildroot/%_libdir"/*.a "%buildroot/%_libdir"/*.la %post -n libprotobuf-c%sover -p /sbin/ldconfig %postun -n libprotobuf-c%sover -p /sbin/ldconfig -%files -%doc ChangeLog TODO -%_bindir/protoc-c -%_bindir/protoc-gen-c - %files -n libprotobuf-c%sover %license LICENSE %_libdir/libprotobuf-c.so.%sover %_libdir/libprotobuf-c.so.%sover.* %files -n libprotobuf-c-devel +%doc ChangeLog TODO +%_bindir/protoc-c +%_bindir/protoc-gen-c %_includedir/*/ %_libdir/libprotobuf-c.so %_libdir/pkgconfig/libprotobuf-c.pc From 0824e18f30b0944103e4b1545f77acc8829a91ca7a73112f3ce4aaf7c6635516 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Nov 2021 11:17:54 +0000 Subject: [PATCH 2/4] Accepting request 933241 from home:iznogood:branches:server:monitoring - Drop no longer needed rpmlintrc. - Also add a protobuf-c >= version Obsoletes to devel sub-package. OBS-URL: https://build.opensuse.org/request/show/933241 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/protobuf-c?expand=0&rev=33 --- protobuf-c-rpmlintrc | 1 - protobuf-c.changes | 6 ++++++ protobuf-c.spec | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) delete mode 100644 protobuf-c-rpmlintrc diff --git a/protobuf-c-rpmlintrc b/protobuf-c-rpmlintrc deleted file mode 100644 index 86ba2d6..0000000 --- a/protobuf-c-rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter('devel-dependency libprotobuf-c-devel') diff --git a/protobuf-c.changes b/protobuf-c.changes index f70cb3d..e1cd791 100644 --- a/protobuf-c.changes +++ b/protobuf-c.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 23 10:10:53 UTC 2021 - Bjørn Lie + +- Drop no longer needed rpmlintrc. +- Also add a protobuf-c >= version Obsoletes to devel sub-package. + ------------------------------------------------------------------- Fri Nov 19 17:38:59 UTC 2021 - Bjørn Lie diff --git a/protobuf-c.spec b/protobuf-c.spec index 2efea98..99861ff 100644 --- a/protobuf-c.spec +++ b/protobuf-c.spec @@ -26,7 +26,6 @@ License: BSD-3-Clause Group: Development/Tools/Other URL: https://github.com/protobuf-c/protobuf-c Source: https://github.com/protobuf-c/protobuf-c/releases/download/v%version/%name-%version.tar.gz -Source99: protobuf-c-rpmlintrc BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc @@ -55,6 +54,7 @@ Summary: C bindings for Google's Protocol Buffers Group: Development/Libraries/C and C++ Requires: libprotobuf-c%sover = %version Provides: %{name} = %version +Obsoletes: %{name} >= %version %description -n libprotobuf-c-devel This package provides a code generator and runtime libraries to use Protocol From 165731fb14ea647c093542e285f939a448ac81c37e0ded2b7f3a2dac53f50e72 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Nov 2021 13:27:29 +0000 Subject: [PATCH 3/4] Accepting request 933253 from home:iznogood:branches:server:monitoring SORRY! OBS-URL: https://build.opensuse.org/request/show/933253 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/protobuf-c?expand=0&rev=34 --- protobuf-c.changes | 2 +- protobuf-c.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/protobuf-c.changes b/protobuf-c.changes index e1cd791..f4210b2 100644 --- a/protobuf-c.changes +++ b/protobuf-c.changes @@ -2,7 +2,7 @@ Tue Nov 23 10:10:53 UTC 2021 - Bjørn Lie - Drop no longer needed rpmlintrc. -- Also add a protobuf-c >= version Obsoletes to devel sub-package. +- Also add a protobuf-c =< version Obsoletes to devel sub-package. ------------------------------------------------------------------- Fri Nov 19 17:38:59 UTC 2021 - Bjørn Lie diff --git a/protobuf-c.spec b/protobuf-c.spec index 99861ff..7c8aeeb 100644 --- a/protobuf-c.spec +++ b/protobuf-c.spec @@ -54,7 +54,7 @@ Summary: C bindings for Google's Protocol Buffers Group: Development/Libraries/C and C++ Requires: libprotobuf-c%sover = %version Provides: %{name} = %version -Obsoletes: %{name} >= %version +Obsoletes: %{name} =< %version %description -n libprotobuf-c-devel This package provides a code generator and runtime libraries to use Protocol From 7f8655fe1e35b0e41dcea96b0df55cc756f427a24525b0a912ad63c55b305b97 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Nov 2021 13:27:52 +0000 Subject: [PATCH 4/4] change out unusual =< OBS-URL: https://build.opensuse.org/package/show/server:monitoring/protobuf-c?expand=0&rev=35 --- protobuf-c.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protobuf-c.spec b/protobuf-c.spec index 7c8aeeb..cf6b1b7 100644 --- a/protobuf-c.spec +++ b/protobuf-c.spec @@ -53,8 +53,8 @@ Buffers from pure C (not C++). Summary: C bindings for Google's Protocol Buffers Group: Development/Libraries/C and C++ Requires: libprotobuf-c%sover = %version -Provides: %{name} = %version -Obsoletes: %{name} =< %version +Provides: %name = %version +Obsoletes: %name <= %version %description -n libprotobuf-c-devel This package provides a code generator and runtime libraries to use Protocol