diff --git a/.gitignore b/.gitignore index 039fa15..830429c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ apcupsd-3.14.8.tar.gz /apcupsd-3.14.11.tar.gz /apcupsd-3.14.12.tar.gz /apcupsd-3.14.13.tar.gz +/apcupsd-3.14.14.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index 1fca5dd..91e8ebb 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.13 -Release: 3%{?dist} +Version: 3.14.14 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -9,6 +9,7 @@ URL: http://www.apcupsd.com Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf +Source3: apcupsd64x64.png Patch0: apcupsd-3.14.3-init.patch Patch1: apcupsd-3.14.4-shutdown.patch @@ -21,7 +22,7 @@ Patch4: apcupsd-3.14.9-fixgui.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 -BuildRequires: net-snmp-devel, tcp_wrappers-devel +BuildRequires: net-snmp-devel, tcp_wrappers-devel, libusb-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail Requires(post): systemd-units @@ -72,7 +73,9 @@ printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile %build %global _hardened_build 1 cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ -export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS" +export CPPFLAGS="$RPM_OPT_FLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS -Wno-format-security -Wno-error=format-security" +export CXXFLAGS="$CPPFLAGS" +export CFLAGS="$CPPFLAGS" %configure \ --sysconfdir="%{_sysconfdir}/apcupsd" \ --with-cgi-bin="%{_localstatedir}/www/apcupsd" \ @@ -85,8 +88,7 @@ export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS" --enable-net-snmp \ --enable-snmp \ --enable-usb \ - --enable-powerflute \ - --enable-nls \ + --enable-modbus-usb \ --enable-gapcmon \ --enable-pcnet \ --with-libwrap=%{_libdir} \ @@ -100,7 +102,6 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/apcupsd make DESTDIR=$RPM_BUILD_ROOT install @@ -116,12 +117,14 @@ install -d %{buildroot}%{_sysconfdir}/logrotate.d install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -d %{buildroot}%{_sysconfdir}/httpd/conf.d install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf +install -D -m0644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/apcupsd64x64.png desktop-file-install \ %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) --vendor="fedora" \ %endif --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + --set-icon=apcupsd64x64 \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop @@ -165,6 +168,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/gapcmon %{_datadir}/applications/*gapcmon.desktop %{_datadir}/pixmaps/apcupsd.png +%{_datadir}/pixmaps/apcupsd64x64.png %{_datadir}/pixmaps/charging.png %{_datadir}/pixmaps/gapc_prefs.png %{_datadir}/pixmaps/onbatt.png @@ -183,6 +187,17 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 02 2016 Michal Hlavinka - 3.14.14-1 +- updated to 3.14.14 + +* Wed Feb 03 2016 Fedora Release Engineering - 3.14.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Nov 23 2015 Michal Hlavinka - 3.14.13-4 +- fix apcaccess crash if apcupsd is not running (#1236367,#1197383) +- enabled modbus-usb (#1195071) +- add bigger icon (#1157532) + * Wed Jun 17 2015 Fedora Release Engineering - 3.14.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/apcupsd64x64.png b/apcupsd64x64.png new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources index 290d693..4cc7ee2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c291d9d3923b4d9c0e600b755ad4f489 apcupsd-3.14.13.tar.gz +cc8f5ced77f38906a274787acb9bc980 apcupsd-3.14.14.tar.gz