Hello community, here is the log from the commit of package pcp for openSUSE:Factory checked in at 2012-07-31 13:37:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcp (Old) and /work/SRC/openSUSE:Factory/.pcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcp", Maintainer is "rw@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pcp/pcp.changes 2012-07-03 21:42:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcp.new/pcp.changes 2012-07-31 13:59:35.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Jul 30 11:54:34 UTC 2012 - ddiss@suse.com + +- use addFilter for rpmlintrc, setBadness is not acceptable for Factory. + +------------------------------------------------------------------- +Thu Jul 19 15:28:03 UTC 2012 - ddiss@suse.com + +- Spec file cleanups following feedback from Sascha. + + Do not remove the buildroot as part of %install + + Use %suse_version rather than %_vendor + + Add pcp-rpmlintrc script for devel-file-in-non-devel-package errors + + Remove runlevel 4 references from init scripts + + Add explicit perl version Requires + +------------------------------------------------------------------- New: ---- pcp-rpmlintrc rm_init_script_runlevel_4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcp.spec ++++++ --- /var/tmp/diff_new_pack.ZG8jZa/_old 2012-07-31 13:59:43.000000000 +0200 +++ /var/tmp/diff_new_pack.ZG8jZa/_new 2012-07-31 13:59:43.000000000 +0200 @@ -23,7 +23,7 @@ Release: 1 %define buildversion 1 -%if "%{_vendor}" == "suse" +%if (0%{?suse_version} > 0) %define pcp_gr System/Monitoring %define lib_pkg libpcp3 %define lib_pkg_conflict pcp-libs @@ -34,6 +34,7 @@ %define license_gplv2 GPL-2.0 %define license_lgplv2 LGPL-2.0 %define license_lgplv2plus LGPL-2.1+ +%define perl_version %(perl -V:version | sed "s!.*='!!;s!'.*!!") %else %define pcp_gr Applications/System %define lib_pkg pcp-libs @@ -51,6 +52,7 @@ Url: http://oss.sgi.com/projects/pcp Group: %{pcp_gr} Source0: ftp://oss.sgi.com/projects/pcp/download/pcp-%{version}-%{buildversion}.src.tar.gz +Source1: pcp-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf bison flex ncurses-devel procps readline-devel @@ -61,8 +63,9 @@ Patch11: fix_configure_path_tests.patch Patch12: configure_append_pcp_subdir.patch Patch13: remove_cpan_rpaths.patch +Patch14: rm_init_script_runlevel_4.patch -%if "%{_vendor}" == "suse" +%if (0%{?suse_version} > 0) Requires: sysconfig cpp %else Requires: initscripts @@ -125,8 +128,8 @@ Summary: Performance Co-Pilot (PCP) Perl bindings and documentation Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} -%if "%{_vendor}" == "suse" -Requires: perl-base +%if (0%{?suse_version} > 0) +Requires: perl = %{perl_version} %endif %description -n perl-PCP-PMDA @@ -145,8 +148,8 @@ Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} -%if "%{_vendor}" == "suse" -Requires: perl-base +%if (0%{?suse_version} > 0) +Requires: perl = %{perl_version} %endif %description -n perl-PCP-MMV @@ -166,8 +169,8 @@ Summary: Performance Co-Pilot Perl bindings for importing external archive data Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} -%if "%{_vendor}" == "suse" -Requires: perl-base +%if (0%{?suse_version} > 0) +Requires: perl = %{perl_version} %endif %description -n perl-PCP-LogImport @@ -184,8 +187,8 @@ Summary: Performance Co-Pilot Perl bindings for processing pmlogsummary output Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} -%if "%{_vendor}" == "suse" -Requires: perl-base +%if (0%{?suse_version} > 0) +Requires: perl = %{perl_version} %endif %description -n perl-PCP-LogSummary @@ -260,6 +263,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 autoconf %configure --localstatedir=/var/lib @@ -270,7 +274,6 @@ make default_pcp %install -rm -Rf $RPM_BUILD_ROOT export DIST_ROOT=$RPM_BUILD_ROOT make install_pcp @@ -278,7 +281,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/pcp -%if "%{_vendor}" == "suse" +%if (0%{?suse_version} > 0) # add /etc/init.d/X symlinks at /usr/sbin/rcX %__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sbindir} for script in pcp pmie pmproxy pmlogger pmcd; do @@ -305,7 +308,7 @@ cat base_pmdas.list base_binfiles.list base_man1files.list > base_specialfiles.list -%if "%{_vendor}" == "suse" +%if (0%{?suse_version} > 0) %preun %{?stop_on_removal:%{stop_on_removal pmlogger pmie pmproxy pmcd}} @@ -364,7 +367,7 @@ %defattr(-,root,root) # pcp_doc_dir should be derived from a configure option, currently it's not %{_datadir}/doc/packages/pcp-%{version} -%if "%{_vendor}" == "suse" +%if (0%{?suse_version} > 0) %{_sbindir}/rc* %endif @@ -458,7 +461,7 @@ %files -n perl-PCP-PMDA -f perl-pcp-pmda.list %defattr(-,root,root) -%if "%{_vendor}" == "suse" +%if (0%{?suse_version} > 0) %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/PMDA @@ -466,7 +469,7 @@ %files -n perl-PCP-MMV -f perl-pcp-mmv.list %defattr(-,root,root) -%if "%{_vendor}" == "suse" +%if (0%{?suse_version} > 0) %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/MMV @@ -474,7 +477,7 @@ %files -n perl-PCP-LogImport -f perl-pcp-logimport.list %defattr(-,root,root) -%if "%{_vendor}" == "suse" +%if (0%{?suse_version} > 0) %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/LogImport @@ -482,7 +485,7 @@ %files -n perl-PCP-LogSummary -f perl-pcp-logsummary.list %defattr(-,root,root) -%if "%{_vendor}" == "suse" +%if (0%{?suse_version} > 0) %dir %{_prefix}/lib/perl5/vendor_perl/*/PCP %endif ++++++ pcp-rpmlintrc ++++++ # Note: there are some headers (e.g. domain.h) and in a few cases some # C source files that rpmlint complains about. These are not devel files, # but rather they are (slightly obscure) PMDA config files. # addFilter('E: devel-file-in-non-devel-package') ++++++ rm_init_script_runlevel_4.patch ++++++ Index: pcp-3.6.4/src/pmcd/rc_pcp =================================================================== --- pcp-3.6.4.orig/src/pmcd/rc_pcp +++ pcp-3.6.4/src/pmcd/rc_pcp @@ -35,7 +35,7 @@ # Should-Start: $network $remote_fs $syslog $time # Required-Stop: $local_fs # Should-Stop: $network $remote_fs $syslog -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Legacy control for PCP daemons # Description: Legacy init script wrapper for the Performance Co-Pilot (PCP) daemons Index: pcp-3.6.4/src/pmcd/rc_pmcd =================================================================== --- pcp-3.6.4.orig/src/pmcd/rc_pmcd +++ pcp-3.6.4/src/pmcd/rc_pmcd @@ -30,7 +30,7 @@ # Should-Start: $network $remote_fs $syslog $time # Required-Stop: $local_fs # Should-Stop: $network $remote_fs $syslog -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmcd (the collection daemon for PCP) # Description: Configure and control pmcd (the collection daemon for the Performance Co-Pilot) Index: pcp-3.6.4/src/pmie/rc_pmie =================================================================== --- pcp-3.6.4.orig/src/pmie/rc_pmie +++ pcp-3.6.4/src/pmie/rc_pmie @@ -24,7 +24,7 @@ # Should-Start: $local_fs $network $syslog $time $pmcd # Required-Stop: $remote_fs # Should-Stop: $local_fs $network $syslog $pmcd -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmie (performance inference engine for PCP) # Description: Configure and control pmie (the performance inference engine for the Performance Co-Pilot) Index: pcp-3.6.4/src/pmlogger/rc_pmlogger =================================================================== --- pcp-3.6.4.orig/src/pmlogger/rc_pmlogger +++ pcp-3.6.4/src/pmlogger/rc_pmlogger @@ -30,7 +30,7 @@ # Should-Start: $network $remote_fs $syslog $time $pmcd # Required-Stop: $local_fs # Should-Stop: $network $remote_fs $syslog $pmcd -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmlogger (the performance metrics logger for PCP) # Description: Configure and control pmlogger (the performance metrics logger for the Performance Co-Pilot) Index: pcp-3.6.4/src/pmproxy/rc_pmproxy =================================================================== --- pcp-3.6.4.orig/src/pmproxy/rc_pmproxy +++ pcp-3.6.4/src/pmproxy/rc_pmproxy @@ -30,7 +30,7 @@ # Should-Start: $local_fs $network $syslog $time $pmcd # Required-Stop: $remote_fs # Should-Stop: $local_fs $network $syslog $pmcd -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmproxy (the pmcd proxy daemon for PCP) # Description: Configure and control pmproxy (the pmcd proxy daemon for the Performance Co-Pilot) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org