Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2018-11-28 11:13:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nut" Wed Nov 28 11:13:29 2018 rev:64 rq:652114 version:2.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/nut/nut.changes 2018-08-13 09:54:52.878897762 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new.19453/nut.changes 2018-11-28 11:14:13.154829745 +0100 @@ -1,0 +2,23 @@ +Tue Nov 27 09:19:23 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com> + +- Give up on packaging the tex docu as it fails to build with + latest texlive + +------------------------------------------------------------------- +Tue Nov 13 09:36:13 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com> + +- Add missing tex dependencies so we can generate the pdf with + newer releases of texlive + +------------------------------------------------------------------- +Tue Nov 13 09:24:40 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com> + +- Drop patch docs-destination-dir.patch which is quite pointless + +------------------------------------------------------------------- +Sun Oct 7 18:53:54 UTC 2018 - suse+build@de-korte.org + +- Remove invalid option 'destination-dir' when generating PDF + files (docs-destination-dir.patch) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.dczeHF/_old 2018-11-28 11:14:15.318826716 +0100 +++ /var/tmp/diff_new_pack.dczeHF/_new 2018-11-28 11:14:15.318826716 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -37,7 +37,7 @@ Version: 2.7.4 Release: 0 Summary: Network UPS Tools Core (Uninterruptible Power Supply Monitoring) -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Hardware/UPS Url: http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz @@ -63,12 +63,11 @@ BuildRequires: apache2-devel BuildRequires: asciidoc BuildRequires: avahi-devel -BuildRequires: dblatex BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libcppunit-devel BuildRequires: libtool -%if 0%{?suse_version} >= 1330 +%if 0%{?suse_version} >= 1500 BuildRequires: libnsl-devel %endif BuildRequires: libusb-devel @@ -85,7 +84,6 @@ BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(udev) -BuildRequires: tex(upquote.sty) Requires: logrotate Requires: usbutils Requires(post): udev @@ -97,12 +95,19 @@ Provides: nut-classic = %{version} Obsoletes: nut-classic < %{version} Obsoletes: nut-hal < %{version} +# Obsolete all the docu stuff with now disabled tex dependency +Obsoletes: %{name}-devel-doc-html +Obsoletes: %{name}-devel-doc-pdf +Obsoletes: %{name}-doc-asciidoc +Obsoletes: %{name}-doc-html +Obsoletes: %{name}-doc-images +Obsoletes: %{name}-doc-pdf %{?systemd_requires} BuildRequires: pkgconfig(bash-completion) %ifarch %{ix86} x86_64 ia64 BuildRequires: pkgconfig(libfreeipmi) %endif -%if 0%{?suse_version} >= 1330 +%if 0%{?suse_version} >= 1500 Requires(pre): user(upsd) %endif @@ -160,91 +165,6 @@ Network UPS Tools is a collection of programs which provide a common interface for monitoring and administering UPS hardware. -%package doc-images -Summary: Network UPS Tools - Images for Documentation -Group: Documentation/Other -Requires: %{name}-doc-images = %{version} -Recommends: %{name} = %{version} -Enhances: %{name} -BuildArch: noarch - -%description doc-images -Images for the documentation. It is a supplementary package for some NUT -documentation packages. - -Network UPS Tools is a collection of programs which provide a common -interface for monitoring and administering UPS hardware. - -%package doc-asciidoc -Summary: Network UPS Tools - Documentation in AsciiDoc Format -Group: Documentation/Other -Requires: %{name}-doc-images = %{version} -Recommends: %{name} = %{version} -Enhances: %{name} -BuildArch: noarch - -%description doc-asciidoc -NUT manuals in AsciiDoc format (human readable source). - -Network UPS Tools is a collection of programs which provide a common -interface for monitoring and administering UPS hardware. - -%package doc-pdf -Summary: Network UPS Tools - Documentation in PDF -Group: Documentation/Other -Recommends: %{name} = %{version} -Enhances: %{name} -BuildArch: noarch - -%description doc-pdf -User manual in PDF format. - -Network UPS Tools is a collection of programs which provide a common -interface for monitoring and administering UPS hardware. - -%package doc-html -Summary: Network UPS Tools - Documentation in HTML -Group: Documentation/HTML -Requires: %{name}-doc-images = %{version} -Recommends: %{name} = %{version} -Enhances: %{name} -BuildArch: noarch - -%description doc-html -User manual in HTML format. - -Network UPS Tools is a collection of programs which provide a common -interface for monitoring and administering UPS hardware. - -%package devel-doc-pdf -Summary: Network UPS Tools - Documentation in PDF -Group: Documentation/Other -Recommends: %{name} = %{version} -Enhances: %{name} -BuildArch: noarch - -%description devel-doc-pdf -Developer manual in PDF format. - -Network UPS Tools is a collection of programs which provide a common -interface for monitoring and administering UPS hardware. - -%package devel-doc-html -Summary: Network UPS Tools - Documentation in HTML -# For CSS files: -Group: Documentation/HTML -Requires: %{name}-doc-html = %{version} -Requires: %{name}-doc-images = %{version} -Recommends: %{name} = %{version} -Enhances: %{name} -BuildArch: noarch - -%description devel-doc-html -Developer manual in HTML format. - -Network UPS Tools is a collection of programs which provide a common -interface for monitoring and administering UPS hardware. - %prep %setup -q cp -a %{SOURCE2} %{SOURCE5} %{SOURCE6} %{SOURCE7} . @@ -268,7 +188,7 @@ --sysconfdir=%{CONFPATH} \ --datadir=%{_datadir}/nut \ --with-all \ - --with-doc \ + --without-doc \ --with-ssl \ --with-openssl \ --without-nss \ @@ -285,12 +205,7 @@ --with-udev-dir=%{_libexecdir}/udev \ --enable-option-checking=fatal -# There is a bug in build that makes impossible to build in parallel -cd docs -make -j1 -cd .. # does not create reproducible output with parallelism -# possibly similar problem as https://bugzilla.sudo.ws/show_bug.cgi?id=842 make -j1 PORT=$(sed -n 's/#define PORT //p' config.log) if test "$PORT" = 3493 ; then @@ -326,15 +241,6 @@ mkdir -p %{buildroot}%{bashcompletionsdir} install -m0644 scripts/misc/nut.bash_completion %{buildroot}%{bashcompletionsdir}/nut -# Documentation -mkdir -p %{buildroot}%{_docdir}/%{name} -cp -a AUTHORS COPYING ChangeLog MAINTAINERS NEWS README README.SUSE UPGRADING %{buildroot}%{_docdir}/%{name}/ -cp -a docs/*.txt docs/cables docs/images %{buildroot}%{_docdir}/%{name}/ -cp -a docs/*.css docs/*.html docs/*.pdf %{buildroot}%{_docdir}/%{name}/ - -# Not needed for packaged contents: -rm %{buildroot}%{_docdir}/%{name}/packager-guide.* - # Create symlinks for man pages %fdupes -s %{buildroot}%{_mandir} @@ -357,8 +263,8 @@ sed -i s/@UPSD_INITIAL_SLAVE_PASSWORD@/$UPSD_INITIAL_SLAVE_PASSWORD/ %{CONFPATH}/upsd.users fi # Be sure that all files are owned by a dedicated user. -/bin/chown %{NUT_USER}:root %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users -/bin/chmod 600 %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users +chown %{NUT_USER}:root %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users +chmod 600 %{CONFPATH}/upsd.conf %{CONFPATH}/upsmon.conf %{CONFPATH}/upsd.users # Migrate Suspend to Disc to the new convention (bnc#449861 and later bnc#871406): # It was never on by default, but documentation up to 11.0 recommends # "shutdown -z +0" for suspend to disc. It was discontinued before 11.0. @@ -371,7 +277,7 @@ sed -i 's:%{_bindir}/powersave -U:%{_bindir}/systemctl hibernate:;s:powersave -U:%{_bindir}/systemctl hibernate:' %{_sysconfdir}/ups/upsmon.conf fi # And finally trigger udev to set permissions according to newly installed rules files. -/sbin/udevadm trigger --subsystem-match=usb --property-match=DEVTYPE=usb_device +udevadm trigger --subsystem-match=usb --property-match=DEVTYPE=usb_device %service_add_post nut-driver.service nut-server.service nut-monitor.service %preun @@ -384,8 +290,8 @@ %postun -n libupsclient1 -p /sbin/ldconfig %files -%doc %dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/[A-EG-Z]* +%doc AUTHORS ChangeLog MAINTAINERS NEWS README README.SUSE UPGRADING +%license COPYING %config %{_sysconfdir}/logrotate.d/* %{_bindir}/* %{_datadir}/nut @@ -437,32 +343,4 @@ %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/*%{ext_man} -%files doc-images -%doc %dir %{_docdir}/%{name} -%{_docdir}/%{name}/images - -%files doc-asciidoc -%doc %dir %{_docdir}/%{name} -%{_docdir}/%{name}/*.txt -%{_docdir}/%{name}/cables - -%files doc-pdf -%doc %dir %{_docdir}/%{name} -%{_docdir}/%{name}/FAQ.pdf -%{_docdir}/%{name}/cables.pdf -%{_docdir}/%{name}/user-manual.pdf - -%files doc-html -%{_docdir}/%{name}/FAQ.html -%{_docdir}/%{name}/cables.html -%{_docdir}/%{name}/user-manual.html -%{_docdir}/%{name}/*.css - -%files devel-doc-pdf -%doc %dir %{_docdir}/%{name} -%{_docdir}/%{name}/developer-guide.pdf - -%files devel-doc-html -%{_docdir}/%{name}/developer-guide.html - %changelog