From 18e12acc5928f2c73952423bfa8085fddb582a46 Mon Sep 17 00:00:00 2001
From: liqiuyu <liqiuyu@kylinos.cn>
Date: Wed, 6 Apr 2022 15:42:14 +0800
Subject: [PATCH] Change buildrequires from postgresql-13-server-devel to
 postgresql-server-devel

---
 collectd.spec | 71 +++++++++++++++++++++++++++------------------------
 collectd.yaml |  4 +++
 2 files changed, 42 insertions(+), 33 deletions(-)
 create mode 100644 collectd.yaml

diff --git a/collectd.spec b/collectd.spec
index 9c6f9fe..eaa8c19 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,33 +1,35 @@
 %global __provides_exclude_from ^%{_libdir}/collectd/.*\\.so$
 %undefine _strict_symbol_defs_build
+%global _privatelibs lib(pq|pgtypes|ecpg_compat|ecpg)\\.so*
+%global __requires_exclude %{_privatelibs}
 
-Summary: Statistics collection daemon for filling RRD files
-Name: collectd
-Version: 5.9.0
-Release: 1
-License: GPLv2
-URL: https://collectd.org/
+Summary:          Statistics collection daemon for filling RRD files
+Name:             collectd
+Version:          5.9.0
+Release:          2
+License:          GPLv2
+URL:              https://collectd.org/
 
-Source: https://collectd.org/files/%{name}-%{version}.tar.bz2
-Source1: collectd-httpd.conf
-Source2: collectd.service
-Source91: apache.conf
-Source92: email.conf
-Source93: mysql.conf
-Source94: nginx.conf
-Source95: sensors.conf
-Source96: snmp.conf
-Source97: rrdtool.conf
-Source98: onewire.conf
+Source:           https://collectd.org/files/%{name}-%{version}.tar.bz2
+Source1:          collectd-httpd.conf
+Source2:          collectd.service
+Source3:          apache.conf
+Source4:          email.conf
+Source5:          mysql.conf
+Source6:          nginx.conf
+Source7:          sensors.conf
+Source8:          snmp.conf
+Source9:          rrdtool.conf
+Source10:         onewire.conf
 
-Patch0: %{name}-include-collectd.d.patch
+Patch0:           %{name}-include-collectd.d.patch
 
-BuildRequires: perl-devel
-BuildRequires: perl-generators
-BuildRequires: perl-interpreter
-BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl(ExtUtils::Embed)
-BuildRequires: libgcrypt-devel
+BuildRequires:    perl-devel
+BuildRequires:    perl-generators
+BuildRequires:    perl-interpreter
+BuildRequires:    perl(ExtUtils::MakeMaker)
+BuildRequires:    perl(ExtUtils::Embed)
+BuildRequires:    libgcrypt-devel
 Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
@@ -334,7 +336,7 @@ an extension for the PHP interpreter.
 %package postgresql
 Summary:       PostgreSQL plugin for collectd
 Requires:      %{name} = %{version}-%{release}
-BuildRequires: libpq-devel
+BuildRequires: postgresql-server-devel
 %description postgresql
 PostgreSQL querying plugin. This plugins provides data of issued commands,
 called handlers and database traffic.
@@ -603,14 +605,14 @@ find contrib -name '*.p[lm]' -exec mv {} perl-examples/ \;
 
 # Move config contribs
 mkdir -p %{buildroot}%{_sysconfdir}/collectd.d/
-cp %{SOURCE91} %{buildroot}%{_sysconfdir}/collectd.d/apache.conf
-cp %{SOURCE92} %{buildroot}%{_sysconfdir}/collectd.d/email.conf
-cp %{SOURCE93} %{buildroot}%{_sysconfdir}/collectd.d/mysql.conf
-cp %{SOURCE94} %{buildroot}%{_sysconfdir}/collectd.d/nginx.conf
-cp %{SOURCE95} %{buildroot}%{_sysconfdir}/collectd.d/sensors.conf
-cp %{SOURCE96} %{buildroot}%{_sysconfdir}/collectd.d/snmp.conf
-cp %{SOURCE97} %{buildroot}%{_sysconfdir}/collectd.d/rrdtool.conf
-cp %{SOURCE98} %{buildroot}%{_sysconfdir}/collectd.d/onewire.conf
+cp %{SOURCE3} %{buildroot}%{_sysconfdir}/collectd.d/apache.conf
+cp %{SOURCE4} %{buildroot}%{_sysconfdir}/collectd.d/email.conf
+cp %{SOURCE5} %{buildroot}%{_sysconfdir}/collectd.d/mysql.conf
+cp %{SOURCE6} %{buildroot}%{_sysconfdir}/collectd.d/nginx.conf
+cp %{SOURCE7} %{buildroot}%{_sysconfdir}/collectd.d/sensors.conf
+cp %{SOURCE8} %{buildroot}%{_sysconfdir}/collectd.d/snmp.conf
+cp %{SOURCE9} %{buildroot}%{_sysconfdir}/collectd.d/rrdtool.conf
+cp %{SOURCE10} %{buildroot}%{_sysconfdir}/collectd.d/onewire.conf
 
 # configs for subpackaged plugins
 %ifnarch s390 s390x
@@ -1036,5 +1038,8 @@ make check
 
 
 %changelog
+* Wed Apr 06 2022 liqiuyu <liqiuyu@kylinos.cn> - 5.9.0-2
+- Change buildrequires from postgresql-13-server-devel to postgresql-server-devel
+
 * Tue Aug 17 2021 Python_Bot <Python_Bot@openeuler.org> - 5.9.0-1
 - Init package
diff --git a/collectd.yaml b/collectd.yaml
new file mode 100644
index 0000000..7c982bd
--- /dev/null
+++ b/collectd.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: oVirt/collectd
+tag_prefix: ^v
+separator: "."