Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pcp for openSUSE:Factory checked in at 2024-04-18 22:10:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcp (Old) and /work/SRC/openSUSE:Factory/.pcp.new.26366 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcp" Thu Apr 18 22:10:46 2024 rev:74 rq:1168500 version:6.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pcp/pcp.changes 2024-04-09 16:46:19.414074888 +0200 +++ /work/SRC/openSUSE:Factory/.pcp.new.26366/pcp.changes 2024-04-18 22:11:31.075081866 +0200 @@ -1,0 +2,6 @@ +Mon Apr 15 10:51:06 UTC 2024 - Dirk Müller <dmuel...@suse.com> + +- move pmlogger_daily into main package (bsc#1222815) +- fix compile flags conflusion + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcp.spec ++++++ --- /var/tmp/diff_new_pack.21wgaZ/_old 2024-04-18 22:11:32.327127878 +0200 +++ /var/tmp/diff_new_pack.21wgaZ/_new 2024-04-18 22:11:32.327127878 +0200 @@ -559,6 +559,7 @@ + # # pcp-conf # @@ -581,6 +582,7 @@ + # # pcp-libs # @@ -671,6 +673,7 @@ + # # pcp-devel # @@ -694,6 +697,7 @@ + # # pcp-testsuite # @@ -722,6 +726,7 @@ + # # perl-PCP-PMDA. This is the PCP agent perl binding. # @@ -747,6 +752,7 @@ + # # perl-PCP-MMV # @@ -774,6 +780,7 @@ + # # perl-PCP-LogImport # @@ -798,6 +805,7 @@ + # # perl-PCP-LogSummary # @@ -825,6 +833,7 @@ + # # pcp-import-sar2pcp # @@ -852,6 +861,7 @@ + # # pcp-import-iostat2pcp # @@ -920,6 +930,7 @@ + # # pcp-import-ganglia2pcp # @@ -946,6 +957,7 @@ + # # pcp-import-collectl2pcp # @@ -1011,6 +1023,7 @@ + # # pcp-export-pcp2graphite # @@ -1037,6 +1050,7 @@ + # pcp-export-pcp2influxdb # %package export-pcp2influxdb @@ -1064,6 +1078,7 @@ + # # pcp-export-pcp2json # @@ -1088,6 +1103,7 @@ + # # pcp-export-pcp2spark # @@ -1150,6 +1166,7 @@ + # # pcp-export-pcp2zabbix # @@ -1260,6 +1277,7 @@ + #end pcp-pmda-activemq # # pcp-pmda-bind2 @@ -1284,6 +1302,7 @@ + #end pcp-pmda-bind2 # # pcp-pmda-redis @@ -1348,6 +1367,7 @@ + #end pcp-pmda-bonding # # pcp-pmda-dbping @@ -1373,6 +1393,7 @@ + #end pcp-pmda-dbping # # pcp-pmda-ds389 @@ -1401,6 +1422,7 @@ + #end pcp-pmda-ds389 # # pcp-pmda-ds389log @@ -1425,6 +1447,7 @@ + #end pcp-pmda-ds389log # # pcp-pmda-gpfs @@ -1448,6 +1471,7 @@ + #end pcp-pmda-gpfs # # pcp-pmda-gpsd @@ -1472,6 +1496,7 @@ + #end pcp-pmda-gpsd # # pcp-pmda-docker @@ -1491,6 +1516,7 @@ + #end pcp-pmda-docker # # pcp-pmda-lustre @@ -1515,6 +1541,7 @@ + #end pcp-pmda-lustre # # pcp-pmda-lustrecomm @@ -1540,6 +1567,7 @@ + #end pcp-pmda-lustrecomm # # pcp-pmda-memcache @@ -1565,6 +1593,7 @@ + #end pcp-pmda-memcache # # pcp-pmda-mysql @@ -1594,6 +1623,7 @@ + #end pcp-pmda-mysql # # pcp-pmda-named @@ -1619,6 +1649,7 @@ + #end pcp-pmda-named # pcp-pmda-netfilter # @@ -1643,6 +1674,7 @@ + #end pcp-pmda-netfilter # # pcp-pmda-news @@ -1668,6 +1700,7 @@ + #end pcp-pmda-news # # pcp-pmda-nginx @@ -1694,6 +1727,7 @@ + #end pcp-pmda-nginx # # pcp-pmda-oracle @@ -1720,6 +1754,7 @@ + #end pcp-pmda-oracle # # pcp-pmda-pdns @@ -1745,6 +1780,7 @@ + #end pcp-pmda-pdns # # pcp-pmda-postfix @@ -1787,6 +1823,7 @@ + #end pcp-pmda-postfix # # pcp-pmda-rsyslog @@ -1817,6 +1854,7 @@ + #end pcp-pmda-rsyslog # # pcp-pmda-samba @@ -1842,6 +1880,7 @@ + #end pcp-pmda-samba # # pcp-pmda-slurm @@ -1907,6 +1946,7 @@ + #end pcp-pmda-vmware # # pcp-pmda-zimbra @@ -1929,6 +1969,7 @@ + #end pcp-pmda-zimbra # # pcp-pmda-dm @@ -1971,6 +2012,7 @@ + # end pcp-pmda-gluster # # pcp-pmda-nfsclient @@ -2032,6 +2074,7 @@ + # end pcp-pmda-zswap # # pcp-pmda-unbound @@ -2056,6 +2099,7 @@ + # end pcp-pmda-unbound # # pcp-pmda-mic @@ -2080,6 +2124,7 @@ + # end pcp-pmda-mic # # pcp-pmda-haproxy @@ -2149,6 +2194,7 @@ + #end pcp-pmda-elasticsearch # # pcp-pmda-openvswitch @@ -2173,6 +2219,7 @@ + #end pcp-pmda-openvswitch # # pcp-pmda-rabbitmq @@ -2249,6 +2296,7 @@ + #end pcp-pmda-openmetrics # # pcp-pmda-lmsensors @@ -2276,6 +2324,7 @@ + # end pcp-pmda-lmsensors # # pcp-pmda-netcheck @@ -2388,6 +2437,7 @@ + # end pcp-pmda-apache # # pcp-pmda-bash @@ -2412,6 +2462,7 @@ + # end pcp-pmda-bash # # pcp-pmda-cifs @@ -2435,6 +2486,7 @@ + # end pcp-pmda-cifs # # pcp-pmda-cisco @@ -2459,6 +2511,7 @@ + # end pcp-pmda-cisco # # pcp-pmda-gfs2 @@ -2482,6 +2535,7 @@ + # end pcp-pmda-gfs2 # # pcp-pmda-logger @@ -2507,6 +2561,7 @@ + # end pcp-pmda-logger # # pcp-pmda-mailq @@ -2531,6 +2586,7 @@ + # end pcp-pmda-mailq # # pcp-pmda-mounts @@ -2555,6 +2611,7 @@ + # end pcp-pmda-mounts # # pcp-pmda-nvidia-gpu @@ -2578,6 +2635,7 @@ + # end pcp-pmda-nvidia-gpu # # pcp-pmda-roomtemp @@ -2642,6 +2700,7 @@ + # end pcp-pmda-sendmail # # pcp-pmda-shping @@ -2667,6 +2726,7 @@ + # end pcp-pmda-shping # # pcp-pmda-smart @@ -2689,6 +2749,7 @@ + #end pcp-pmda-smart # # pcp-pmda-sockets @@ -2711,6 +2772,7 @@ + #end pcp-pmda-sockets # # pcp-pmda-hacluster @@ -2732,6 +2794,7 @@ + # end pcp-pmda-hacluster # # pcp-pmda-summary @@ -2794,6 +2857,7 @@ + # end pcp-pmda-trace # # pcp-pmda-weblog @@ -2819,6 +2883,7 @@ + # end pcp-pmda-weblog # end C pmdas @@ -2976,7 +3041,7 @@ %endif # tmpdir used during build https://github.com/performancecopilot/pcp/issues/1140 export PACKAGE_BUILD_DATE=`date -u -r CHANGELOG +%Y-%m-%d` -PCP_CFLAGS="%{optflags}" CFLAGS="%{optflags}" CCFLAGS="%{optflags}" CXXFLAGS="%{optflags}" %configure \ +PCP_CFLAGS="%{optflags}" CFLAGS="%{optflags} -std=c99" CCFLAGS="%{optflags}" CXXFLAGS="%{optflags}" %configure \ --with-tmpdir=%{_tempsdir} \ --datarootdir=%{_datadir} \ --docdir=%{_docdir} \ @@ -2994,7 +3059,7 @@ %{?_with_snmp} \ %{?_with_nutcracker} \ %{?_with_python2} -PCP_CFLAGS="%{optflags}" CFLAGS="%{optflags} -std=c99" CCFLAGS="%{optflags}" CXXFLAGS="%{optflags}" make default_pcp +%make_jobs default_pcp ############################################################################### @@ -3189,7 +3254,6 @@ grep -E -v 'atop|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' |\ grep -E -v 'numastat|shping|tapestat|uptime|verify|selinux-setup' |\ %endif - grep -E -v 'pmlogger_daily' |\ grep -E -v 'pmsnap' |\ sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >base_exec.list echo %{_libexecdir}/pcp/lib >>base_exec.list @@ -3266,12 +3330,6 @@ getent group pcpqa >/dev/null || groupadd -r pcpqa getent passwd pcpqa >/dev/null || \ useradd -c "PCP Quality Assurance" -g pcpqa -d %{_testsdir} -M -r -s /bin/bash pcpqa 2>/dev/null -exit 0 - -%if 0%{?suse_version} && !%{disable_systemd} -%pre zeroconf -%service_add_pre pmlogger_daily.timer -%endif %pre %if 0%{?suse_version} && !%{disable_systemd} @@ -3280,12 +3338,6 @@ getent group pcp >/dev/null || groupadd -r pcp getent passwd pcp >/dev/null || \ useradd -c "Performance Co-Pilot" -g pcp -d %{_localstatedir}/lib/pcp -M -r -s /sbin/nologin pcp -exit 0 - -%if 0%{?suse_version} && !%{disable_systemd} -%preun zeroconf -%service_del_preun pmlogger_daily.timer -%endif %preun %if 0%{?suse_version} @@ -3321,9 +3373,6 @@ %post zeroconf %if 0%{?suse_version} -%if !%{disable_systemd} -%service_add_post pmlogger_daily.timer -%endif %else %if !%{disable_systemd} systemctl restart pmcd >/dev/null 2>&1 @@ -3426,11 +3475,6 @@ %{selinux_handle_policy "$1" "pcpupstream-container"} %endif -%if 0%{?suse_version} && !%{disable_systemd} -%postun zeroconf -%service_del_postun pmlogger_daily.timer -%endif - %if 0%{?suse_version} %postun /sbin/ldconfig @@ -3656,9 +3700,12 @@ %endif %if %{disable_systemd} %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger +%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger-daily-report %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmfind %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie %else +%{_unitdir}/pmlogger_daily.service +%{_unitdir}/pmlogger_daily.timer %{_unitdir}/pmlogger_check.service %{_unitdir}/pmlogger_check.timer %{_unitdir}/pmie_check.service @@ -3737,13 +3784,8 @@ %endif %files zeroconf -%{_libexecdir}/pcp/bin/pmlogger_daily %if !%{disable_systemd} -# systemd services for pmlogger_daily to replace the cron script -%{_unitdir}/pmlogger_daily.service -%{_unitdir}/pmlogger_daily.timer %else -%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger-daily-report %endif %config(noreplace) %{_confdir}/pmieconf/zeroconf %config(noreplace) %{_confdir}/pmlogconf/zeroconf
