commit apcupsd for openSUSE:Factory

2020-08-20 Thread root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2020-08-20 22:29:58

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new.3399 (New)


Package is "apcupsd"

Thu Aug 20 22:29:58 2020 rev:69 rq:828032 version:3.14.14

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2019-08-20 
10:59:50.532650630 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new.3399/apcupsd.changes
2020-08-20 22:30:06.140017061 +0200
@@ -1,0 +2,15 @@
+Thu Aug 20 07:32:55 UTC 2020 - Dominique Leuenberger 
+
+- Fix build when /etc/os-release contains a LIST as ID_LIKE (which
+  is valid). Simply pass --with-distname=suse to configure when
+  %suse_version is defined. This is 'a nice way' of not explicitly
+  breaking build for non-suse releases (even though we're not
+  verifying it would really build on other distros based on this
+  spec).
+
+---
+Wed Aug 19 09:41:05 UTC 2020 - Callum Farmer 
+
+- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.Qftpxx/_old  2020-08-20 22:30:07.412017655 +0200
+++ /var/tmp/diff_new_pack.Qftpxx/_new  2020-08-20 22:30:07.420017659 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package apcupsd
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -45,7 +45,6 @@
 Patch13:apcupsd-3.14.9-fixgui.patch
 BuildRequires:  apache-rpm-macros
 BuildRequires:  apache2-devel
-BuildRequires:  distribution-release
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -121,7 +120,10 @@
--enable-modbus-usb \
--enable-test \
--with-cgi-bin=%{apache_datadir}/cgi-bin \
-   --with-distname=$(grep ID_LIKE %{_sysconfdir}/os-release | cut -d = -f 
2 | tr -d '"')
+%if 0%{?suse_version}
+   --with-distname=suse \
+%endif
+%nil
 make %{?_smp_mflags}
 
 %install
@@ -142,16 +144,16 @@
 %fdupes -s examples/rpt/
 
 rm -r %{buildroot}/%{_datadir}/hal
-mkdir -p %{buildroot}%{_libexecdir}/systemd/system-sleep
-sed "s:@PWRFAILDIR@:%{_sysconfdir}/%{name}:g" <%{name}.hibernate 
>%{buildroot}%{_libexecdir}/systemd/system-sleep/apcupsd.sh
-chmod +x %{buildroot}%{_libexecdir}/systemd/system-sleep/apcupsd.sh
+mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep
+sed "s:@PWRFAILDIR@:%{_sysconfdir}/%{name}:g" <%{name}.hibernate 
>%{buildroot}%{_prefix}/lib/systemd/system-sleep/apcupsd.sh
+chmod +x %{buildroot}%{_prefix}/lib/systemd/system-sleep/apcupsd.sh
 
 mkdir -p %{buildroot}%{_fillupdir}
 cp %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.%{name}
 
 # systemd support and remove initd support for opensuse 12.2 and higher
 install -p -D -m644 %{name}.service %{buildroot}%{_unitdir}/%{name}.service
-install -p -D -m755 %{name}_shutdown 
%{buildroot}%{_libexecdir}/systemd/system-shutdown/%{name}_shutdown
+install -p -D -m755 %{name}_shutdown 
%{buildroot}%{_prefix}/lib/systemd/system-shutdown/%{name}_shutdown
 rm %{buildroot}%{_initddir}/%{name}
 
 install -d %{buildroot}%{_sysconfdir}/logrotate.d
@@ -198,8 +200,8 @@
 %{_sbindir}/smtp
 %{_sbindir}/rc%{name}
 %{_unitdir}/%{name}.service
-%{_libexecdir}/systemd/system-shutdown/%{name}_shutdown
-%{_libexecdir}/systemd/system-sleep/%{name}.sh
+%{_prefix}/lib/systemd/system-shutdown/%{name}_shutdown
+%{_prefix}/lib/systemd/system-sleep/%{name}.sh
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/changeme
 %config(noreplace) %{_sysconfdir}/%{name}/commfailure





commit apcupsd for openSUSE:Factory

2019-08-20 Thread root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2019-08-20 10:59:49

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new.22127 (New)


Package is "apcupsd"

Tue Aug 20 10:59:49 2019 rev:68 rq:724697 version:3.14.14

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2019-08-13 
13:24:56.805360243 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new.22127/apcupsd.changes   
2019-08-20 10:59:50.532650630 +0200
@@ -1,0 +2,7 @@
+Tue Aug 20 02:06:15 UTC 2019 - Bjørn Lie 
+
+- Pass --enable-usb, --enable-modbus-usb and --enable-test to
+  configure aswell, build all the drivers we used to build with
+  --enable-all (boo#1145913).
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.1j2lCQ/_old  2019-08-20 10:59:51.272650477 +0200
+++ /var/tmp/diff_new_pack.1j2lCQ/_new  2019-08-20 10:59:51.276650476 +0200
@@ -117,6 +117,9 @@
--with-lock-dir=%{_localstatedir}/lock \
--enable-gapcmon \
--enable-cgi \
+   --enable-usb \
+   --enable-modbus-usb \
+   --enable-test \
--with-cgi-bin=%{apache_datadir}/cgi-bin \
--with-distname=$(grep ID_LIKE %{_sysconfdir}/os-release | cut -d = -f 
2 | tr -d '"')
 make %{?_smp_mflags}





commit apcupsd for openSUSE:Factory

2019-08-13 Thread root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2019-08-13 13:24:56

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new.9556 (New)


Package is "apcupsd"

Tue Aug 13 13:24:56 2019 rev:67 rq:722800 version:3.14.14

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2019-07-11 
13:15:14.162828084 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new.9556/apcupsd.changes
2019-08-13 13:24:56.805360243 +0200
@@ -1,0 +2,10 @@
+Fri Aug  9 18:52:07 UTC 2019 - Bjørn Lie 
+
+- Stop passing enable-all to configure, pass enable-gapcmon and
+  enable-cgi instead, reflecting what we actually build.
+- Following this, drop unused pkgconfig(gnome-vfs-2.0)
+  BuildRequires and add pkgconfig(glib-2.0) and
+  pkgconfig(gthread-2.0), align with what configure actually checks
+  for.
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.07Z0Cr/_old  2019-08-13 13:24:57.309360111 +0200
+++ /var/tmp/diff_new_pack.07Z0Cr/_new  2019-08-13 13:24:57.309360111 +0200
@@ -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/
 #
 
 
@@ -26,7 +26,7 @@
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
 License:GPL-2.0-only
 Group:  Hardware/UPS
-Url:http://www.apcupsd.com/
+URL:http://www.apcupsd.com/
 Source: 
https://sourceforge.net/projects/apcupsd/files/apcupsd%%20-%%20Stable/%{version}/apcupsd-%{version}.tar.gz
 Source2:README.SUSE
 Source4:%{name}.hibernate
@@ -59,7 +59,8 @@
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(gdlib)
-BuildRequires:  pkgconfig(gnome-vfs-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(x11)
@@ -113,8 +114,9 @@
 %configure \
--sysconfdir=%{_sysconfdir}/%{name} \
--with-libwrap \
-   --enable-all \
--with-lock-dir=%{_localstatedir}/lock \
+   --enable-gapcmon \
+   --enable-cgi \
--with-cgi-bin=%{apache_datadir}/cgi-bin \
--with-distname=$(grep ID_LIKE %{_sysconfdir}/os-release | cut -d = -f 
2 | tr -d '"')
 make %{?_smp_mflags}





commit apcupsd for openSUSE:Factory

2019-07-11 Thread root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2019-07-11 13:14:55

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new.4615 (New)


Package is "apcupsd"

Thu Jul 11 13:14:55 2019 rev:66 rq:713343 version:3.14.14

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2018-03-22 
12:11:43.367467420 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new.4615/apcupsd.changes
2019-07-11 13:15:14.162828084 +0200
@@ -1,0 +2,8 @@
+Wed Jul  3 13:45:08 UTC 2019 - matthias.gerst...@suse.com
+
+- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
+  firewalld, see [1].
+
+  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
+---

Old:

  apcupsd.firewall



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.PmeAcw/_old  2019-07-11 13:15:14.994827742 +0200
+++ /var/tmp/diff_new_pack.PmeAcw/_new  2019-07-11 13:15:14.994827742 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package apcupsd
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,7 +35,6 @@
 Source7:apcupsd-httpd.conf
 Source8:
https://sourceforge.net/projects/apcupsd/files/apcupsd%%20-%%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig
 Source9:%{name}.keyring
-Source10:   %{name}.firewall
 # PATCH-FIX-OPENSUSE apcupsd-suse.patch sbra...@suse.cz -- Do not perform halt 
script alternation on install.
 Patch0: apcupsd-suse.patch
 # PATCH-FEATURE-OPENSUSE apcupsd-hibernate.patch sbra...@suse.cz -- Support 
for hibernation on powerfail.
@@ -155,9 +154,6 @@
 install -d %{buildroot}%{_sysconfdir}/apache2/conf.d/
 install -m0644 %{SOURCE7} 
%{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}.conf
 
-# firewall config
-install -m 644 -D %{SOURCE10} 
%{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
-
 %pre
 %service_add_pre %{name}.service
 
@@ -207,7 +203,6 @@
 %config(noreplace) %{_sysconfdir}/%{name}/offbattery
 %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%config(noreplace) %attr(0644,root,root) 
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 %attr(0755,root,root) %{_sysconfdir}/%{name}/apccontrol
 %{_mandir}/man?/*.*
 %{_fillupdir}/sysconfig.%{name}





commit apcupsd for openSUSE:Factory

2018-03-22 Thread root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2018-03-22 12:07:13

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is "apcupsd"

Thu Mar 22 12:07:13 2018 rev:65 rq:589741 version:3.14.14

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2018-03-19 
23:40:16.733239454 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2018-03-22 
12:11:43.367467420 +0100
@@ -1,0 +2,5 @@
+Wed Mar 21 12:25:20 UTC 2018 - tchva...@suse.com
+
+- Do not use path based dependency but use normal package name
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.6t7tKQ/_old  2018-03-22 12:11:45.151403483 +0100
+++ /var/tmp/diff_new_pack.6t7tKQ/_new  2018-03-22 12:11:45.155403339 +0100
@@ -64,7 +64,7 @@
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(x11)
-Requires:   %{_bindir}/mail
+Requires:   mailx
 Requires(post): %fillup_prereq
 Requires(post): grep
 Requires(post): sed





commit apcupsd for openSUSE:Factory

2018-03-19 Thread root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2018-03-19 23:39:45

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is "apcupsd"

Mon Mar 19 23:39:45 2018 rev:64 rq:588548 version:3.14.14

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2017-12-20 
10:40:42.955288073 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2018-03-19 
23:40:16.733239454 +0100
@@ -1,0 +2,9 @@
+Thu Mar 15 11:04:07 UTC 2018 - tchva...@suse.com
+
+- Drop support for < sle12, also removes patch:
+  * apcupsd-pm-utils.patch
+- Drop intitscript
+- Format with spec-cleaner
+- Use license macros instead of %doc macros
+
+---
@@ -24 +33 @@
-  are commented out, so this file acts as example only.
+  are commented out, so this file acts as example only. bsc#950950

Old:

  apcupsd-pm-utils.patch
  apcupsd.init



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.eJ9cEq/_old  2018-03-19 23:40:17.965195013 +0100
+++ /var/tmp/diff_new_pack.eJ9cEq/_new  2018-03-19 23:40:17.969194869 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package apcupsd
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,25 +18,22 @@
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-
-%define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null || 
%{_sbindir}/apxs -q PREFIX)
 Name:   apcupsd
 Version:3.14.14
 Release:0
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
-License:GPL-2.0
+License:GPL-2.0-only
 Group:  Hardware/UPS
 Url:http://www.apcupsd.com/
-Source: 
https://sourceforge.net/projects/apcupsd/files/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz
-Source1:apcupsd.init
+Source: 
https://sourceforge.net/projects/apcupsd/files/apcupsd%%20-%%20Stable/%{version}/apcupsd-%{version}.tar.gz
 Source2:README.SUSE
 Source4:%{name}.hibernate
 Source5:%{name}.sysconfig
 Source6:%{name}.logrotate
 Source7:apcupsd-httpd.conf
-Source8:
https://sourceforge.net/projects/apcupsd/files/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig
+Source8:
https://sourceforge.net/projects/apcupsd/files/apcupsd%%20-%%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig
 Source9:%{name}.keyring
 Source10:   %{name}.firewall
 # PATCH-FIX-OPENSUSE apcupsd-suse.patch sbra...@suse.cz -- Do not perform halt 
script alternation on install.
@@ -47,45 +44,32 @@
 Patch11:apcupsd-3.14.8-systemd.patch
 # PATCH-FIX-OPENSUSE apcupsd-3.14.9-fixgui.patch rhbz#578276 
p.drou...@gmail.com -- fix crash in gui
 Patch13:apcupsd-3.14.9-fixgui.patch
-# PATCH-FEATURE-OPENSUSE apcupsd-pm-utils.patch sbra...@suse.cz -- Use 
pm-utils in openSUSE < 13.1 and SLE < 12
-Patch15:apcupsd-pm-utils.patch
+BuildRequires:  apache-rpm-macros
 BuildRequires:  apache2-devel
 BuildRequires:  distribution-release
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  gconf2-devel
-BuildRequires:  gd-devel
-BuildRequires:  gnome-vfs2-devel
-BuildRequires:  gtk2-devel
 BuildRequires:  libusb-devel
 BuildRequires:  mailx
 BuildRequires:  ncurses-devel
+BuildRequires:  pkgconfig
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  systemd-sysvinit
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(gdlib)
+BuildRequires:  pkgconfig(gnome-vfs-2.0)
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(x11)
 Requires:   %{_bindir}/mail
 Requires(post): %fillup_prereq
-Requires(post): %{_bindir}/grep
-# sed and grep are still prerequred to finish upgrade from sysvinit scripts:
-Requires(post): %{_bindir}/sed
-Suggests:   logrotate
-%if 0%{?suse_version} > 1210
-BuildRequires:  systemd-rpm-macros
-BuildRequires:  systemd-sysvinit
-%else
-BuildRequires:  sysvinit
-%endif
-%if 0%{?suse_version} >= 1310
-BuildRequires:  systemd
-%else
-BuildRequires:  pm-utils
-%endif
-%if 0%{?suse_version} > 1220
+Requires(post): grep
+Requires(post): sed
+Recommends: logrotate
 %{?systemd_requires}
-%else

commit apcupsd for openSUSE:Factory

2017-12-20 Thread root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2017-12-20 10:40:39

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is "apcupsd"

Wed Dec 20 10:40:39 2017 rev:63 rq:558675 version:3.14.14

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2017-11-25 
08:42:35.658399135 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2017-12-20 
10:40:42.955288073 +0100
@@ -1,0 +2,5 @@
+Mon Dec 11 13:53:35 UTC 2017 - crrodrig...@opensuse.org
+
+- BuildRequire pkgconfig(x11) not xorg-x11-devel 
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.5UoyAY/_old  2017-12-20 10:40:43.991213135 +0100
+++ /var/tmp/diff_new_pack.5UoyAY/_new  2017-12-20 10:40:43.995212846 +0100
@@ -63,7 +63,7 @@
 BuildRequires:  ncurses-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11-devel
+BuildRequires:  pkgconfig(x11)
 Requires:   %{_bindir}/mail
 Requires(post): %fillup_prereq
 Requires(post): %{_bindir}/grep





commit apcupsd for openSUSE:Factory

2017-11-24 Thread root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2017-11-25 08:42:31

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is "apcupsd"

Sat Nov 25 08:42:31 2017 rev:62 rq:545068 version:3.14.14

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2017-09-04 
12:35:36.265571256 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2017-11-25 
08:42:35.658399135 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:43:36 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.Tj4PFM/_old  2017-11-25 08:42:37.642326850 +0100
+++ /var/tmp/diff_new_pack.Tj4PFM/_new  2017-11-25 08:42:37.646326706 +0100
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null || 
%{_sbindir}/apxs -q PREFIX)
 Name:   apcupsd
 Version:3.14.14
@@ -170,8 +175,8 @@
 chmod +x %{buildroot}%{_sysconfdir}/pm/sleep.d/99%{name}
 %endif
 
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-cp %{SOURCE5} 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+mkdir -p %{buildroot}%{_fillupdir}
+cp %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.%{name}
 
 # systemd support and remove initd support for opensuse 12.2 and higher
 %if 0%{?suse_version} > 1210
@@ -285,7 +290,7 @@
 %config(noreplace) %attr(0644,root,root) 
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 %attr(0755,root,root) %{_sysconfdir}/%{name}/apccontrol
 %{_mandir}/man?/*.*
-%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
 
 %files gui
 %defattr(-,root,root)





commit apcupsd for openSUSE:Factory

2017-09-04 Thread root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2017-09-04 12:35:35

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is "apcupsd"

Mon Sep  4 12:35:35 2017 rev:61 rq:520255 version:3.14.14

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2016-12-26 
21:45:51.607724894 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2017-09-04 
12:35:36.265571256 +0200
@@ -1,0 +2,8 @@
+Thu Aug 31 17:04:39 UTC 2017 - dims...@opensuse.org
+
+- Pass --with-distname=, based on the values of ID_LIKE from
+  /etc/os-release to configure. Since the removal of
+  /etc/SuSE-release, the build system is no longer able to identify
+  us building on a SUSE system. Let's help it.
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.WHZ3CN/_old  2017-09-04 12:35:37.605382871 +0200
+++ /var/tmp/diff_new_pack.WHZ3CN/_new  2017-09-04 12:35:37.625380060 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package apcupsd
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -61,10 +61,10 @@
 BuildRequires:  xorg-x11-devel
 Requires:   %{_bindir}/mail
 Requires(post): %fillup_prereq
+Requires(post): %{_bindir}/grep
 # sed and grep are still prerequred to finish upgrade from sysvinit scripts:
-Requires(post): %{_bindir}/sed %{_bindir}/grep
+Requires(post): %{_bindir}/sed
 Suggests:   logrotate
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1210
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  systemd-sysvinit
@@ -133,7 +133,8 @@
--enable-all \
--enable-nls \
--with-lock-dir=%{_localstatedir}/lock \
-   --with-cgi-bin=%{apache_serverroot}/cgi-bin
+   --with-cgi-bin=%{apache_serverroot}/cgi-bin \
+   --with-distname=$(grep ID_LIKE %{_sysconfdir}/os-release | cut -d = -f 
2 | tr -d '"')
 make %{?_smp_mflags}
 
 %install





commit apcupsd for openSUSE:Factory

2016-06-19 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2016-06-19 10:48:36

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is "apcupsd"

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2015-07-14 
17:46:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2016-06-19 
10:48:37.0 +0200
@@ -1,0 +2,31 @@
+Tue May 31 23:09:00 CEST 2016 - manfre...@gmx.ch
+
+- Update to apcupsd version 3.14.14
+  * win32: Fix missing DLLs when installing only apctray
+  * Fixes for socket error handling. Resolves apcaccess crash when connection 
+fails as well as several other theoretical issues.
+  * MODBUS/USB error handling (COMMLOST) improvements for faulty USB links
+  * Fix hiddev binding when usbfs is mounted on /dev/bus/usb instead of 
+/proc/bus/usb. This is necessary for switching between MODBUS/USB and
+USB/HID on Linux.
+  * Update GPLv2 text and FSF address to match current versions from FSF.
+  * Various fixes for potential issues suggested by Coverity Scan
+  * MacOS X port support for El Capitan System Integrity Protection (SIP)
+aka "rootless"
+  * Fix shutdown failure on Windows when UPSNAME includes spaces
+  * Fix building bsd-usb driver
+(This was broken when modbus-usb support was added.)
+  * Add status display for output current as well as apparent power
+- fix firewall rule installation in spec file
+- drop BuildRequires: net-snmp-devel, net-snmp was dropped in favour of 
snmplite
+- drop installation of own automake files for ppc64, not needed any more
+- Removed patches, fixed in upstream:
+  * apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff
+  * fix-fsf-adress.patch
+  * apcupsd-3.14.1-cloexec.patch
+  * apcupsd-gpp.patch
+- Removed patch, not needed as it builds on all supported arches,
+  and not linking against libstdc++ is done on purpose:
+  * apcupsd-3.14.8-cxxld.patch
+
+---
@@ -14 +45 @@
-- Version bumpt o 3.13.13:
+- Version bump to 3.14.13:

Old:

  apcupsd-3.14.1-cloexec.patch
  apcupsd-3.14.13.tar.gz
  apcupsd-3.14.13.tar.gz.sig
  apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff
  apcupsd-3.14.8-cxxld.patch
  apcupsd-gpp.patch
  fix-fsf-adress.patch

New:

  apcupsd-3.14.14.tar.gz
  apcupsd-3.14.14.tar.gz.sig



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.1NlWV4/_old  2016-06-19 10:48:38.0 +0200
+++ /var/tmp/diff_new_pack.1NlWV4/_new  2016-06-19 10:48:38.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package apcupsd
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,44 +18,33 @@
 
 %define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null || 
%{_sbindir}/apxs -q PREFIX)
 Name:   apcupsd
-Version:3.14.13
+Version:3.14.14
 Release:0
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
 License:GPL-2.0
 Group:  Hardware/UPS
 Url:http://www.apcupsd.com/
-Source: 
http://downloads.sourceforge.net/project/apcupsd/apcupsd%%20-%%20Stable/%{version}/apcupsd-%{version}.tar.gz
+Source: 
https://sourceforge.net/projects/apcupsd/files/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz
 Source1:apcupsd.init
 Source2:README.SUSE
 Source4:%{name}.hibernate
 Source5:%{name}.sysconfig
 Source6:%{name}.logrotate
 Source7:apcupsd-httpd.conf
-Source8:
http://downloads.sourceforge.net/project/apcupsd/apcupsd%%20-%%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig
+Source8:
https://sourceforge.net/projects/apcupsd/files/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig
 Source9:%{name}.keyring
 Source10:   %{name}.firewall
 # PATCH-FIX-OPENSUSE apcupsd-suse.patch sbra...@suse.cz -- Do not perform halt 
script alternation on install.
 Patch0: apcupsd-suse.patch
-# PATCH-FIX-OPENSUSE apcupsd-gpp.patch sbra...@suse.cz -- Build against C++ 
unfriendly system tcpd.h. See below.
-Patch1: apcupsd-gpp.patch
 # PATCH-FEATURE-OPENSUSE apcupsd-hibernate.patch sbra...@suse.cz -- Support 
for hibernation on powerfail.
 Patch2: apcupsd-hibernate.patch
-# PATCH-FIX-OPENSUSE apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff 
se...@opensuse.org -- Fix build with newer net-snmp by undefining MIB.
-Patch9: 

commit apcupsd for openSUSE:Factory

2015-07-14 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2015-07-14 17:45:11

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2015-05-02 
21:36:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2015-07-14 
17:46:26.0 +0200
@@ -1,0 +2,5 @@
+Mon Jul 13 12:33:03 UTC 2015 - tchva...@suse.com
+
+- Ensure locfile is properly set bnc#929444
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.AJBrrN/_old  2015-07-14 17:46:27.0 +0200
+++ /var/tmp/diff_new_pack.AJBrrN/_new  2015-07-14 17:46:27.0 +0200
@@ -24,14 +24,14 @@
 License:GPL-2.0
 Group:  Hardware/UPS
 Url:http://www.apcupsd.com/
-Source: 
http://downloads.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz
+Source: 
http://downloads.sourceforge.net/project/apcupsd/apcupsd%%20-%%20Stable/%{version}/apcupsd-%{version}.tar.gz
 Source1:apcupsd.init
 Source2:README.SUSE
 Source4:%{name}.hibernate
 Source5:%{name}.sysconfig
 Source6:%{name}.logrotate
 Source7:apcupsd-httpd.conf
-Source8:
http://downloads.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig
+Source8:
http://downloads.sourceforge.net/project/apcupsd/apcupsd%%20-%%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig
 Source9:%{name}.keyring
 Source10:   %{name}.firewall
 # PATCH-FIX-OPENSUSE apcupsd-suse.patch sbra...@suse.cz -- Do not perform halt 
script alternation on install.
@@ -72,9 +72,9 @@
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
 Requires:   %{_bindir}/mail
+Requires(post): %fillup_prereq
 # sed and grep are still prerequred to finish upgrade from sysvinit scripts:
 Requires(post): %{_bindir}/sed %{_bindir}/grep
-Requires(post): %fillup_prereq
 Suggests:   logrotate
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}  1210
@@ -148,11 +148,12 @@
 %endif
 
 %build
-%configure\
-   --sysconfdir=%{_sysconfdir}/%{name}\
-   --with-libwrap\
-   --enable-all\
-   --enable-nls\
+%configure \
+   --sysconfdir=%{_sysconfdir}/%{name} \
+   --with-libwrap \
+   --enable-all \
+   --enable-nls \
+   --with-lock-dir=%{_localstatedir}/lock \
--with-cgi-bin=%{apache_serverroot}/cgi-bin
 make %{?_smp_mflags}
 
@@ -302,7 +303,7 @@
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %attr(0644,root,root) 
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 %attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol
-%doc %{_mandir}/man?/*.*
+%{_mandir}/man?/*.*
 %{_localstatedir}/adm/fillup-templates/sysconfig.*
 
 %files gui





commit apcupsd for openSUSE:Factory

2015-05-02 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2015-05-02 21:36:01

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2015-04-18 
10:39:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2015-05-02 
21:36:02.0 +0200
@@ -1,0 +2,5 @@
+Sat Apr 18 11:45:54 UTC 2015 - matwey.korni...@gmail.com
+
+- Move *.cgi scripts to apcupsd-cgi package (fix boo#925886)
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.WJw5Ya/_old  2015-05-02 21:36:03.0 +0200
+++ /var/tmp/diff_new_pack.WJw5Ya/_new  2015-05-02 21:36:03.0 +0200
@@ -302,10 +302,6 @@
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %attr(0644,root,root) 
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 %attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol
-%{apache_serverroot}/cgi-bin/multimon.cgi
-%{apache_serverroot}/cgi-bin/upsfstats.cgi
-%{apache_serverroot}/cgi-bin/upsstats.cgi
-%{apache_serverroot}/cgi-bin/upsimage.cgi
 %doc %{_mandir}/man?/*.*
 %{_localstatedir}/adm/fillup-templates/sysconfig.*
 
@@ -321,5 +317,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.css
 %config(noreplace) %{_sysconfdir}/%{name}/hosts.conf
 %config(noreplace) %{_sysconfdir}/%{name}/multimon.conf
+%{apache_serverroot}/cgi-bin/multimon.cgi
+%{apache_serverroot}/cgi-bin/upsfstats.cgi
+%{apache_serverroot}/cgi-bin/upsstats.cgi
+%{apache_serverroot}/cgi-bin/upsimage.cgi
 
 %changelog





commit apcupsd for openSUSE:Factory

2015-04-18 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2015-04-18 10:39:16

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2014-12-03 
22:50:46.0 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2015-04-18 
10:39:17.0 +0200
@@ -1,0 +2,49 @@
+Thu Apr  2 07:26:12 UTC 2015 - tchva...@suse.com
+
+- Version bumpt o 3.13.13:
+  * apcaccess and apcupsd status format updates to ease parsing by scripts
+  * UPS name is included in subject line of emails in default scripts
+  * Default event scripts pull SYSADMIN and APCUPSD_MAIL definitions from a
+common config file so they can easily be configured in one place
+  * MODBUS USB support
+Previous releases supported MODBUS serial (RS232). This release adds
+support for MODBUS over USB. This protocol is preferable to the normal
+USB HID driver because it offers access to more UPS data readouts and
+controls. The only configuration file change needed versus MODBUS serial
+is to change UPSCABLE to usb and use an empty DEVICE setting. See the 
+MODBUS section of the apcupsd manual for more details.
+  * Support for Apple Notification Center on Mac OS X (replaces Growl)
+  * Apple install packages and binaries are signed with an Apple Developer
+key for compatibility with Gate Keeper
+  * Windows USB driver has been updated with additional USB identifiers to
+support future APC products.
+  * Fix issue with certain Back-UPS USB models repeatedly cycling power on/off 
+after killpower is issued
+  * Fix display of battery level during MODBUS calibration
+  * Fix apctest EEPROM setting on various models
+  * Close and reopen serial port during extended COMMLOST in apcsmart driver
+(helps recover connection when USB serial port dongles are reconnected)
+  * Avoid probing non-APC USB devices as it can cause lockups
+  * Fix issue with service failing to start on Windows during boot with USB UPS
+  * Fix bogus lock file error when config file error forces early termination
+  * Fix MODBUS NOMOUTV reading for voltages other than 120VAC
+  * Fix LOADPCT (CI_LOAD) on MODBUS driver
+  * Fix issue with net driver not reporting MODEL value
+  * Fix several potential issues identified by Coverity static analysis
+  * Numerous other fixes and improvements all over the code, many of them
+submitted by users...Thank you!
+- Refreshed patches:
+  * apcupsd-3.14.1-cloexec.patch
+  * apcupsd-3.14.8-cxxld.patch
+  * apcupsd-gpp.patch
+- Removed patch:
+  * apcupsd-3.14.10-nodbg.patch
+
+---
+Thu Apr  2 07:23:30 UTC 2015 - tchva...@suse.com
+
+- Cleanup with spec-cleaner
+- Remove patch that is never applied today:
+  * apcupsd-powersave.patch
+
+--

Old:

  apcupsd-3.14.10-nodbg.patch
  apcupsd-3.14.11.tar.gz
  apcupsd-3.14.11.tar.gz.sig
  apcupsd-powersave.patch

New:

  apcupsd-3.14.13.tar.gz
  apcupsd-3.14.13.tar.gz.sig



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.rrTs5t/_old  2015-04-18 10:39:18.0 +0200
+++ /var/tmp/diff_new_pack.rrTs5t/_new  2015-04-18 10:39:18.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package apcupsd
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,45 +16,13 @@
 #
 
 
+%define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2/dev/null || 
%{_sbindir}/apxs -q PREFIX)
 Name:   apcupsd
-BuildRequires:  apache2-devel
-BuildRequires:  automake
-BuildRequires:  distribution-release
-BuildRequires:  dos2unix
-BuildRequires:  fdupes
-BuildRequires:  gcc-c++
-BuildRequires:  gconf2-devel
-BuildRequires:  gd-devel
-BuildRequires:  gnome-vfs2-devel
-BuildRequires:  gtk2-devel
-BuildRequires:  mailx
-BuildRequires:  ncurses-devel
-BuildRequires:  net-snmp-devel
-BuildRequires:  tcpd-devel
-BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11-devel
-%if 0%{?suse_version}  1220
-BuildRequires:  gpg-offline
-%endif
-%if 0%{?suse_version}  1220
-BuildRequires:  systemd-sysvinit
-%else
-%if 0%{?suse_version}  1210
-BuildRequires:  sysvinit
-%else
-BuildRequires:  sysvinit-init
-%endif
-%endif
-%if %suse_version = 1310
-BuildRequires:  systemd
-%else
-BuildRequires:  pm-utils
-%endif
+Version:3.14.13
+Release:0
 

commit apcupsd for openSUSE:Factory

2014-12-03 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2014-12-03 22:50:13

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2014-11-20 
18:43:10.0 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2014-12-03 
22:50:46.0 +0100
@@ -1,0 +2,5 @@
+Tue Dec  2 22:16:05 CET 2014 - sbra...@suse.cz
+
+- Fix removal of HALT_POWERDOWN_INSERT (bsc#907702).
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.I84yhV/_old  2014-12-03 22:50:48.0 +0100
+++ /var/tmp/diff_new_pack.I84yhV/_new  2014-12-03 22:50:48.0 +0100
@@ -233,13 +233,20 @@
 %if 0%{?suse_version}  1220
 %{fillup_only}
 %service_add_post %{name}.service
-# Remove HALT_POWERDOWN_INSERT, it is not needed with systemd
-if usr/bin/grep -q '^HALT_POWERDOWN_INSERT=\(/etc/init\.d/apcupsd 
try-powerdown\)' etc/sysconfig/shutdown ; then
-  usr/bin/sed -i 's:^\(HALT_POWERDOWN_INSERT=\)\(/etc/init\.d/apcupsd 
try-powerdown\):\1:' etc/sysconfig/shutdown
-else
+# Remove HALT_POWERDOWN_INSERT, it is not needed with systemd (it was last 
time filled in 13.1).
+# We need to handle only the last form, which was already used in SLE11.
+if test -f etc/sysconfig/shutdown ; then
+  if usr/bin/grep -q '^HALT_POWERDOWN_INSERT=' etc/sysconfig/shutdown ; then
+if ! usr/bin/grep -q '^HALT_POWERDOWN_INSERT=' etc/sysconfig/shutdown ; 
then
+  if usr/bin/grep -q '^HALT_POWERDOWN_INSERT=/etc/init\.d/apcupsd 
try-powerdown' etc/sysconfig/shutdown ; then
+usr/bin/sed -i 's:^\(HALT_POWERDOWN_INSERT=\)/etc/init\.d/apcupsd 
try-powerdown:\1:' etc/sysconfig/shutdown
+  else
   echo 2 apcupsd: WARNING: Unknown value of HALT_POWERDOWN_INSERT in 
/etc/sysconfig/shutdown.
-  echo 2  Keeping unchanged. Should be:
+echo 2  Keeping unchanged. If it still exists, it should 
be:
   echo 2 HALT_POWERDOWN_INSERT=\\
+  fi
+fi
+  fi
 fi
 # User installed file, by default in docdir. Not needed any more, and will 
never be.
 rm -f etc/init.d/apcupsd-early-powerdown


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2014-11-20 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2014-11-20 18:43:09

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2014-09-06 
16:53:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2014-11-20 
18:43:10.0 +0100
@@ -1,0 +2,11 @@
+Sun Nov 16 20:08:17 UTC 2014 - matwey.korni...@gmail.com
+
+- Add patch apcupsd-3.14.10-nodbg.patch: reduce amount of debug
+  messages (redhat #1053324)
+
+---
+Sun Nov 16 17:35:44 UTC 2014 - matwey.korni...@gmail.com
+
+- fix HIBERNATE variable initialization in apccontrol script
+
+---

New:

  apcupsd-3.14.10-nodbg.patch



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.N26SdV/_old  2014-11-20 18:43:11.0 +0100
+++ /var/tmp/diff_new_pack.N26SdV/_new  2014-11-20 18:43:11.0 +0100
@@ -88,6 +88,8 @@
 Patch14:fix-fsf-adress.patch
 # PATCH-FEATURE-OPENSUSE apcupsd-pm-utils.patch sbra...@suse.cz -- Use 
pm-utils in openSUSE  13.1 and SLE  12
 Patch15:apcupsd-pm-utils.patch
+# PATCH-FIX-OPENSUSE apcupsd-3.14.10-nodbg.patch rhbz#1053324 
matwey.korni...@gmail.com -- reduce amount of debug messages
+Patch16:apcupsd-3.14.10-nodbg.patch
 Requires:   /usr/bin/mail
 Requires(post):  %fillup_prereq
 # sed and grep are still prerequred to finish upgrade from sysvinit scripts:
@@ -161,6 +163,7 @@
 %if %suse_version  1310
 %patch15
 %endif
+%patch16 -p1
 
 %build
 %configure\

++ apcupsd-3.14.10-nodbg.patch ++
diff -up apcupsd-3.14.10/src/drivers/snmplite/asn.cpp.nodbg 
apcupsd-3.14.10/src/drivers/snmplite/asn.cpp
--- apcupsd-3.14.10/src/drivers/snmplite/asn.cpp.nodbg  2010-09-07 
17:35:13.0 +0200
+++ apcupsd-3.14.10/src/drivers/snmplite/asn.cpp2014-01-21 
17:07:27.603049214 +0100
@@ -26,10 +26,13 @@
 #include stdlib.h
 #include stdio.h
 
+extern int debug_level;
+
 using namespace Asn;
 
 void debug(const char *foo, int indent)
 {
+   if (!debug_level) return;
while (indent--)
   printf( );
printf(%s\n, foo);
@@ -86,7 +89,7 @@ Object *Object::Demarshal(unsigned char
   obj = new Sequence(type);
   break;  
default:
-  printf(UNKNOWN ASN type=0x%02x\n, type);
+  if (debug_level) printf(UNKNOWN ASN type=0x%02x\n, type);
   debug(UNKNOWN, indent);
   obj = NULL;
   break;  

++ apcupsd-hibernate.patch ++
--- /var/tmp/diff_new_pack.N26SdV/_old  2014-11-20 18:43:11.0 +0100
+++ /var/tmp/diff_new_pack.N26SdV/_new  2014-11-20 18:43:11.0 +0100
@@ -4,7 +4,7 @@
  
  APCPID=@PIDDIR@/apcupsd.pid
  APCUPSD=@sbindir@/apcupsd
-+HIBERNATE=/usr/bin/systemctl hibernate
++HIBERNATE=/usr/bin/systemctl hibernate
  SHUTDOWN=@SHUTDOWN@
  SCRIPTSHELL=@SCRIPTSHELL@
  SCRIPTDIR=@sysconfdir@

++ apcupsd-pm-utils.patch ++
--- /var/tmp/diff_new_pack.N26SdV/_old  2014-11-20 18:43:11.0 +0100
+++ /var/tmp/diff_new_pack.N26SdV/_new  2014-11-20 18:43:11.0 +0100
@@ -4,7 +4,7 @@
  
  APCPID=@PIDDIR@/apcupsd.pid
  APCUPSD=@sbindir@/apcupsd
--HIBERNATE=/usr/bin/systemctl hibernate
+-HIBERNATE=/usr/bin/systemctl hibernate
 +HIBERNATE=/usr/sbin/pm-hibernate
  SHUTDOWN=@SHUTDOWN@
  SCRIPTSHELL=@SCRIPTSHELL@

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2014-09-06 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2014-09-06 12:18:40

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2014-05-17 
21:43:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2014-09-06 
16:53:59.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 19 14:45:38 UTC 2014 - wagner-tho...@gmx.at
+
+- added config for SuSEfirewall2
+
+---

New:

  apcupsd.firewall



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.oqw95m/_old  2014-09-06 16:54:00.0 +0200
+++ /var/tmp/diff_new_pack.oqw95m/_new  2014-09-06 16:54:00.0 +0200
@@ -65,6 +65,7 @@
 Source7:apcupsd-httpd.conf
 Source8:
http://downloads.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig
 Source9:%{name}.keyring
+Source10:   %{name}.firewall
 # PATCH-FIX-OPENSUSE apcupsd-suse.patch sbra...@suse.cz -- Do not perform halt 
script alternation on install.
 Patch:  apcupsd-suse.patch
 # PATCH-FIX-OPENSUSE apcupsd-gpp.patch sbra...@suse.cz -- Build against C++ 
unfriendly system tcpd.h. See below.
@@ -217,6 +218,9 @@
 install -d %{buildroot}%{_sysconfdir}/apache2/conf.d/
 install -m0644 %{SOURCE7} 
%{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}.conf
 
+# firewall config
+install -m 644 -D %{SOURCE5} 
%{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+
 %pre
 %if 0%{?suse_version}  1220
 %service_add_pre %{name}.service
@@ -304,6 +308,7 @@
 %config(noreplace) %{_sysconfdir}/%{name}/offbattery
 %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %attr(0644,root,root) 
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 %attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol
 %{apache_serverroot}/cgi-bin/multimon.cgi
 %{apache_serverroot}/cgi-bin/upsfstats.cgi


++ apcupsd.firewall ++
# Do not edit this file as it's just a template and will be
# overwritten on package updates! Copy to a new file instead.
# Fill in the required variables and delete the unused ones.
# If in doubt ask secur...@suse.de
#
# Only the variables TCP, UDP, RPC, IP, BROADCAST, RELATED and
# MODULES are allowed. More may be supported in the future.
#
# For a more detailed description of the individual variables see
# the comments for FW_SERVICES_*_EXT in /etc/sysconfig/SuSEfirewall2
#

## Name: apcupsd
## Description: Opens port for apcupsd.

# space separated list of allowed TCP ports
TCP=apcupsd

# space separated list of allowed UDP ports
UDP=

# space separated list of allowed RPC services
RPC=

# space separated list of allowed IP protocols
IP=

# space separated list of allowed UDP ports that accept broadcasts
BROADCAST=

### variables below are only needed in very special cases

# space separated list of net,protocol[,sport[,dport]]
# see FW_SERVICES_ACCEPT_RELATED_EXT
# net 0/0 means IPv4 and IPv6. If this sevice should only work for
# IPv4 use 0.0.0.0/0
RELATED=

# additional kernel modules needed for this service
# see FW_LOAD_MODULES
MODULES=
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2014-05-17 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2014-05-17 21:43:14

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2014-02-19 
18:56:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2014-05-17 
21:43:15.0 +0200
@@ -1,0 +2,15 @@
+Wed May 14 14:15:04 UTC 2014 - meiss...@suse.com
+
+- %service_add_pre in  %pre section missing, added.
+
+---
+Fri Feb 14 19:42:38 CET 2014 - sbra...@suse.cz
+
+- Replace pm-utils support by systemd (FATE#316824).
+  add: apcupsd-pm-utils.patch (for old products only)
+  replace: apcupsd.hibernate
+  update: apcupsd-hibernate.patch, README.SUSE
+- Fix init script references to apcupsd-lite.
+  update: apcupsd.init
+
+---

New:

  apcupsd-pm-utils.patch



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.gk4rTP/_old  2014-05-17 21:43:17.0 +0200
+++ /var/tmp/diff_new_pack.gk4rTP/_new  2014-05-17 21:43:17.0 +0200
@@ -30,7 +30,6 @@
 BuildRequires:  mailx
 BuildRequires:  ncurses-devel
 BuildRequires:  net-snmp-devel
-BuildRequires:  pm-utils
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
@@ -46,6 +45,11 @@
 BuildRequires:  sysvinit-init
 %endif
 %endif
+%if %suse_version = 1310
+BuildRequires:  systemd
+%else
+BuildRequires:  pm-utils
+%endif
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
 License:GPL-2.0
 Group:  Hardware/UPS
@@ -81,6 +85,8 @@
 Patch13:apcupsd-3.14.9-fixgui.patch
 # PATCH-FIX-OPENSUSE fix-fsf-adress.patch p.drou...@gmail.com -- FSF adress is 
incorrect
 Patch14:fix-fsf-adress.patch
+# PATCH-FEATURE-OPENSUSE apcupsd-pm-utils.patch sbra...@suse.cz -- Use 
pm-utils in openSUSE  13.1 and SLE  12
+Patch15:apcupsd-pm-utils.patch
 Requires:   /usr/bin/mail
 Requires(post):  %fillup_prereq
 # sed and grep are still prerequred to finish upgrade from sysvinit scripts:
@@ -150,8 +156,10 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-
 sed -i '/^#!/d' %{SOURCE1}
+%if %suse_version  1310
+%patch15
+%endif
 
 %build
 %configure\
@@ -166,7 +174,9 @@
 %makeinstall
 install -m744 platforms/apccontrol \
   $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apccontrol
-%if 0%{?suse_version} = 1220
+%if 0%{?suse_version}  1220
+ln -sf /usr/sbin/service $RPM_BUILD_ROOT/%{_sbindir}/rc%{name}
+%else
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 ln -sf ../../etc/init.d/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name}
 %endif
@@ -183,9 +193,15 @@
 %fdupes -s examples/rpt/
 
 rm -r $RPM_BUILD_ROOT/%{_datadir}/hal
+%if %suse_version = 1310
+mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system-sleep
+sed s:@PWRFAILDIR@:%{_sysconfdir}/%{name}:g %{name}.hibernate 
$RPM_BUILD_ROOT/usr/lib/systemd/system-sleep/apcupsd.sh
+chmod +x $RPM_BUILD_ROOT/usr/lib/systemd/system-sleep/apcupsd.sh
+%else
 mkdir -p $RPM_BUILD_ROOT/etc/pm/sleep.d
 sed s:@PWRFAILDIR@:%{_sysconfdir}/%{name}:g %{name}.hibernate 
$RPM_BUILD_ROOT/etc/pm/sleep.d/99apcupsd
 chmod +x $RPM_BUILD_ROOT/etc/pm/sleep.d/99%{name}
+%endif
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 cp %{name}.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name}
 
@@ -201,6 +217,11 @@
 install -d %{buildroot}%{_sysconfdir}/apache2/conf.d/
 install -m0644 %{SOURCE7} 
%{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}.conf
 
+%pre
+%if 0%{?suse_version}  1220
+%service_add_pre %{name}.service
+%endif
+
 %post
 %if 0%{?suse_version}  1220
 %{fillup_only}
@@ -263,15 +284,19 @@
 %{_sbindir}/apcaccess
 %{_sbindir}/apctest
 %{_sbindir}/smtp
+%{_sbindir}/rc%{name}
 %if 0%{?suse_version} = 1220
 %{_initrddir}/%{name}
-%{_sbindir}/rc%{name}
 %else
 %{_unitdir}/%{name}.service
 /usr/lib/systemd/system-shutdown/%{name}_shutdown
 %endif
+%if %suse_version = 1310
+/usr/lib/systemd/system-sleep/%{name}.sh
+%else
 /etc/pm/sleep.d/99%{name}
-%dir %{_sysconfdir}/%{name}/
+%endif
+%dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/changeme
 %config(noreplace) %{_sysconfdir}/%{name}/commfailure
 %config(noreplace) %{_sysconfdir}/%{name}/commok

++ README.SUSE ++
--- /var/tmp/diff_new_pack.gk4rTP/_old  2014-05-17 21:43:17.0 +0200
+++ /var/tmp/diff_new_pack.gk4rTP/_new  2014-05-17 21:43:17.0 +0200
@@ -1,14 +1,22 @@
 Advanced apcupsd configuration
 
 
+WARNING for hybrid sleep (suspend to both)
+
+Hybrid sleep works properly only on human operated desktop systems.
+
+Do not 

commit apcupsd for openSUSE:Factory

2014-02-19 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2014-02-19 18:56:01

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2014-01-29 
07:12:14.0 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2014-02-19 
18:56:04.0 +0100
@@ -1,0 +2,11 @@
+Wed Feb 12 21:05:58 CET 2014 - sbra...@suse.cz
+
+- Updated to version 3.14.11:
+  * APC MODBUS protocol support over RS232
+For more see ReleaseNotes.
+- Verify GPG signature.
+- Remove obsolete apcupsd-early-powerdown script.
+- Remove upgrade scripts for SuSE Linux 8 and SLES 8.
+- Do not call powersave-notify (regression bnc#856907).
+
+---

Old:

  apcupsd-3.14.10.tar.bz2
  apcupsd-early-powerdown.init

New:

  apcupsd-3.14.11.tar.gz
  apcupsd-3.14.11.tar.gz.sig
  apcupsd.keyring



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.W9Wjvy/_old  2014-02-19 18:56:04.0 +0100
+++ /var/tmp/diff_new_pack.W9Wjvy/_new  2014-02-19 18:56:04.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package apcupsd
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:   apcupsd
 BuildRequires:  apache2-devel
 BuildRequires:  automake
@@ -33,29 +34,33 @@
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
-%if 0%{?suse_version} = 1140
-BuildRequires:  sysvinit
-%else
-%if 0%{?suse_version} = 1220
+%if 0%{?suse_version}  1220
+BuildRequires:  gpg-offline
+%endif
+%if 0%{?suse_version}  1220
 BuildRequires:  systemd-sysvinit
 %else
+%if 0%{?suse_version}  1210
+BuildRequires:  sysvinit
+%else
 BuildRequires:  sysvinit-init
 %endif
 %endif
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
 License:GPL-2.0
 Group:  Hardware/UPS
-Version:3.14.10
+Version:3.14.11
 Release:0
 Url:http://www.apcupsd.com/
-Source: apcupsd-%{version}.tar.bz2
+Source: 
http://downloads.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz
 Source1:apcupsd.init
 Source2:README.SUSE
-Source3:apcupsd-early-powerdown.init
-Source4:apcupsd.hibernate
-Source5:apcupsd.sysconfig
-Source6:apcupsd.logrotate 
+Source4:%{name}.hibernate
+Source5:%{name}.sysconfig
+Source6:%{name}.logrotate
 Source7:apcupsd-httpd.conf
+Source8:
http://downloads.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig
+Source9:%{name}.keyring
 # PATCH-FIX-OPENSUSE apcupsd-suse.patch sbra...@suse.cz -- Do not perform halt 
script alternation on install.
 Patch:  apcupsd-suse.patch
 # PATCH-FIX-OPENSUSE apcupsd-gpp.patch sbra...@suse.cz -- Build against C++ 
unfriendly system tcpd.h. See below.
@@ -66,22 +71,24 @@
 Patch3: apcupsd-powersave.patch
 # PATCH-FIX-OPENSUSE apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff 
se...@opensuse.org -- Fix build with newer net-snmp by undefining MIB.
 Patch9: apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff
+# PATCH-FIX-OPENSUSE apcupsd-3.14.1-cloexec.patch 
cristian.rodrig...@opensuse.org -- Close the socket on exec - avoid leaked file 
descriptors, patch from Fedora.
 Patch10:apcupsd-3.14.1-cloexec.patch
-# systemd support
+# PATCH-FIX-OPENSUSE apcupsd-3.14.8-systemd.patch p.drou...@gmail.com -- 
systemd support
 Patch11:apcupsd-3.14.8-systemd.patch
-#fix FTBFS, c++ linking needs -lstdc++ explicitly
+# PATCH-FIX-OPENSUSE apcupsd-3.14.8-cxxld.patch p.drou...@gmail.com -- fix 
FTBFS, c++ linking needs -lstdc++ explicitly
 Patch12:apcupsd-3.14.8-cxxld.patch
-# fix crash in gui, rhbz#578276
+# PATCH-FIX-OPENSUSE apcupsd-3.14.9-fixgui.patch rhbz#578276 
p.drou...@gmail.com -- fix crash in gui
 Patch13:apcupsd-3.14.9-fixgui.patch
-# FSF adress is incorrect
+# PATCH-FIX-OPENSUSE fix-fsf-adress.patch p.drou...@gmail.com -- FSF adress is 
incorrect
 Patch14:fix-fsf-adress.patch
-%if 0%{?suse_version}  1220
-PreReq: %fillup_prereq %insserv_prereq /usr/bin/sed /usr/bin/grep
-%endif
 Requires:   /usr/bin/mail
-%if 0%{?suse_version} = 1220

commit apcupsd for openSUSE:Factory

2014-01-28 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2014-01-29 07:12:13

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2013-03-11 
07:23:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2014-01-29 
07:12:14.0 +0100
@@ -1,0 +2,6 @@
+Thu Jan  9 23:39:33 UTC 2014 - p.drou...@gmail.com
+
+- Add %fillup_prereq PreReq tag and %{fillup_only} in %post to 
+  correctly fillup sysconfig file; fix bnc#837337
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.xf3js2/_old  2014-01-29 07:12:15.0 +0100
+++ /var/tmp/diff_new_pack.xf3js2/_new  2014-01-29 07:12:15.0 +0100
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:   apcupsd
 BuildRequires:  apache2-devel
 BuildRequires:  automake
@@ -82,6 +81,7 @@
 Requires:   /usr/bin/mail
 %if 0%{?suse_version} = 1220
 %{?systemd_requires}
+Requires(pre):  %fillup_prereq
 %endif
 Suggests:   logrotate
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -194,6 +194,7 @@
 %post
 %if 0%{?suse_version} = 1220
 %service_add_post %{name}.service
+%{fillup_only}
 %else
 # HALT_POWERDOWN_INSERT is supported since SuSE Linux 10.1, SLES 10.
 # Install HALT_POWERDOWN_INSERT

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2013-03-11 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2013-03-11 07:23:56

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2013-01-14 
22:19:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2013-03-11 
07:23:57.0 +0100
@@ -1,0 +2,6 @@
+Sun Mar 10 13:07:20 UTC 2013 - dims...@opensuse.org
+
+- Update apcupsd-3.14.8-systemd.patch: apcupsd lives in /usr/sbin,
+  not in /sbin (bnc#801312).
+
+---



Other differences:
--
++ apcupsd-3.14.8-systemd.patch ++
--- /var/tmp/diff_new_pack.XyaAIa/_old  2013-03-11 07:23:59.0 +0100
+++ /var/tmp/diff_new_pack.XyaAIa/_new  2013-03-11 07:23:59.0 +0100
@@ -9,7 +9,7 @@
 +
 +[Service]
 +ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail
-+ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf
++ExecStart=/usr/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf
 +
 +[Install]
 +WantedBy=multi-user.target

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2013-01-14 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2013-01-14 22:19:43

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2013-01-11 
17:10:32.0 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2013-01-14 
22:19:45.0 +0100
@@ -1,0 +2,6 @@
+Fri Jan 11 16:49:03 UTC 2013 - cfarr...@suse.com
+
+- license update: GPL-2.0
+
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.p4JVbM/_old  2013-01-14 22:19:47.0 +0100
+++ /var/tmp/diff_new_pack.p4JVbM/_new  2013-01-14 22:19:47.0 +0100
@@ -44,7 +44,7 @@
 %endif
 %endif
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
-License:GPL-2.0+
+License:GPL-2.0
 Group:  Hardware/UPS
 Version:3.14.10
 Release:0

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2013-01-11 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2013-01-11 17:10:31

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2012-05-31 
17:02:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2013-01-11 
17:10:32.0 +0100
@@ -1,0 +2,34 @@
+Fri Jan 11 09:41:28 UTC 2013 - a...@suse.de
+
+- Remove patch apcupsd-largebuf-overflow.patch, it's upstream now
+
+---
+Fri Jan 11 09:12:45 UTC 2013 - co...@suse.com
+
+- fix build on factory - systemd moved to /usr
+
+---
+Fri Sep 14 20:17:07 UTC 2012 - p.drou...@gmail.com
+
+- Updated to version 3.14.10:
+  * Fix missing status and spurrious incorrect status on newer BackUPS CS
+models using USB interface.
+
+  * USB compatibility fixes for Mac OS X Lion
+
+  * USB driver support for newer Microlink models on Mac OS X Lion and Windows
+
+  * Ignore transitions to battery due to calibration (possible if user
+initiates calibration, then exits apctest and starts apcupsd before 
+calibration completes.
+
+  * Fix truncation of long UPS model names such as Smart-UPS RT 5000 XL
+
+  * Fix MODEL vs. APCMODEL confusion. Remove APCMODEL and rename old MODEL
+aka 'mode' to DRIVER.
+
+- Improve Systemd and logrotate support
+- Remove apcupsd-lite support : difference between apcupsd-lite and 
+  apcupsd are minimal or cpu consumption don't justify his presence
+
+---

Old:

  apcupsd-3.14.8-exit-race.patch
  apcupsd-3.14.8.tar.bz2
  apcupsd-largebuf-overflow.patch

New:

  apcupsd-3.14.10.tar.bz2
  apcupsd-3.14.8-cxxld.patch
  apcupsd-3.14.8-systemd.patch
  apcupsd-3.14.9-fixgui.patch
  apcupsd-httpd.conf
  apcupsd.logrotate
  fix-fsf-adress.patch



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.JxhxCj/_old  2013-01-11 17:10:34.0 +0100
+++ /var/tmp/diff_new_pack.JxhxCj/_new  2013-01-11 17:10:34.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package apcupsd
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,6 +21,7 @@
 BuildRequires:  automake
 BuildRequires:  distribution-release
 BuildRequires:  dos2unix
+BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gconf2-devel
 BuildRequires:  gd-devel
@@ -33,15 +34,19 @@
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
-%if 0%{?suse_version}  1210
+%if 0%{?suse_version} = 1140
 BuildRequires:  sysvinit
 %else
+%if 0%{?suse_version} = 1220
+BuildRequires:  systemd-sysvinit
+%else
 BuildRequires:  sysvinit-init
 %endif
+%endif
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
 License:GPL-2.0+
 Group:  Hardware/UPS
-Version:3.14.8
+Version:3.14.10
 Release:0
 Url:http://www.apcupsd.com/
 Source: apcupsd-%{version}.tar.bz2
@@ -50,6 +55,8 @@
 Source3:apcupsd-early-powerdown.init
 Source4:apcupsd.hibernate
 Source5:apcupsd.sysconfig
+Source6:apcupsd.logrotate 
+Source7:apcupsd-httpd.conf
 # PATCH-FIX-OPENSUSE apcupsd-suse.patch sbra...@suse.cz -- Do not perform halt 
script alternation on install.
 Patch:  apcupsd-suse.patch
 # PATCH-FIX-OPENSUSE apcupsd-gpp.patch sbra...@suse.cz -- Build against C++ 
unfriendly system tcpd.h. See below.
@@ -58,15 +65,25 @@
 Patch2: apcupsd-hibernate.patch
 # PATCH-FEATURE-OPENSUSE apcupsd-powersave.patch sbra...@suse.cz -- Call 
powersave-notify in distros where it is available.
 Patch3: apcupsd-powersave.patch
-# PATCH-FIX-OPENSUSE apcupsd-largebuf-overflow.patch sbra...@suse.cz -- Fix 
static buffer overflow.
-Patch5: apcupsd-largebuf-overflow.patch
 # PATCH-FIX-OPENSUSE apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff 
se...@opensuse.org -- Fix build with newer net-snmp by undefining MIB.
 Patch9: apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff
 Patch10:apcupsd-3.14.1-cloexec.patch
-# PATCH-FIX-UPSTREAM apcupsd-3.14.8-exit-race.patch mkube...@suse.cz -- avoid 
race condition when apcupsd is terminated
-Patch11:apcupsd-3.14.8-exit-race.patch
+# systemd support
+Patch11:

commit apcupsd for openSUSE:Factory

2012-05-31 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2012-05-31 17:02:35

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2012-03-02 
13:46:51.0 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2012-05-31 
17:02:47.0 +0200
@@ -1,0 +2,6 @@
+Tue May 29 15:42:50 UTC 2012 - jeng...@inai.de
+
+- Adjust directory name to source config.guess/sub from
+  to be a /little/ more future proof.
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.NhPtuq/_old  2012-05-31 17:02:48.0 +0200
+++ /var/tmp/diff_new_pack.NhPtuq/_new  2012-05-31 17:02:48.0 +0200
@@ -16,9 +16,9 @@
 #
 
 
-
 Name:   apcupsd
 BuildRequires:  apache2-devel
+BuildRequires:  automake
 BuildRequires:  distribution-release
 BuildRequires:  dos2unix
 BuildRequires:  gcc-c++
@@ -32,7 +32,6 @@
 BuildRequires:  pm-utils
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  automake
 BuildRequires:  xorg-x11-devel
 %if 0%{?suse_version}  1210
 BuildRequires:  sysvinit
@@ -98,7 +97,7 @@
 %prep
 %setup -q
 #This is needed as apcupsd doesn't recognize ppc64 correctly
-cp /usr/share/automake-1.11/config.* ./autoconf/ 
+cp /usr/share/automake*/config.{guess,sub} autoconf/ 
 cp -a %{S:1} platforms/suse/apcupsd.in
 cp -a %{S:2} %{S:4} %{S:5} .
 cp -a %{S:3} apcupsd-early-powerdown

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2012-03-02 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2012-03-02 13:46:49

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2012-02-08 
17:17:23.0 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2012-03-02 
13:46:51.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar  1 20:26:01 UTC 2012 - a...@suse.de
+
+- Buildrequire xorg-x11-devel
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.OM4KlC/_old  2012-03-02 13:46:53.0 +0100
+++ /var/tmp/diff_new_pack.OM4KlC/_new  2012-03-02 13:46:53.0 +0100
@@ -33,6 +33,7 @@
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  automake
+BuildRequires:  xorg-x11-devel
 %if 0%{?suse_version}  1210
 BuildRequires:  sysvinit
 %else
@@ -70,7 +71,6 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2/dev/null || 
/usr/sbin/apxs -q PREFIX)
 
-
 %description
 Controls and monitors the status of an APC UPS under Linux. Allows your
 computer or server to run for a specified length of time on UPS power
@@ -82,12 +82,10 @@
 
 %package gui
 
-
 Summary:APC UPS Monitor GUI (for APC UPSs)
 Group:  Hardware/UPS
 Requires:   %{name} = %{version}
 
-
 %description gui
 Controls and monitors the status of an APC UPS under Linux. Allows your
 computer or server to run for a specified length of time on UPS power
@@ -119,7 +117,6 @@
 %patch10 -p1
 %patch11
 
-
 %build
 # Incomplete:
 #cd autoconf
@@ -147,7 +144,6 @@
--with-cgi-bin=%{apache_serverroot}/cgi-bin
 make %{?_smp_mflags}
 
-
 %install
 %makeinstall
 mkdir -p $RPM_BUILD_ROOT/sbin
@@ -170,7 +166,6 @@
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 cp apcupsd.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.apcupsd
 
-
 %post
 %{fillup_and_insserv apcupsd}
 # HALT_POWERDOWN_INSERT is supported since SuSE Linux 10.1, SLES 10.
@@ -194,11 +189,9 @@
 fi
 fi
 
-
 %preun
 %{stop_on_removal apcupsd}
 
-
 %postun
 # Remove HALT_POWERDOWN_INSERT
 if test $1 -eq 0 -a ! -f /etc/init.d/apcupsd ; then
@@ -216,7 +209,6 @@
 %{restart_on_update apcupsd}
 %{insserv_cleanup}
 
-
 %files
 %defattr(-,root,root)
 %doc apcupsd-early-powerdown COPYING ChangeLog* DISCLAIMER Developers INSTALL 
README.SUSE ReleaseNotes examples/
@@ -253,13 +245,10 @@
 %doc %{_mandir}/man?/*.*
 /var/adm/fillup-templates/sysconfig.*
 
-
 %files gui
 %defattr(-,root,root)
 %{_bindir}/gapcmon
 %{_datadir}/applications/gapcmon.desktop
 %{_datadir}/pixmaps/*.png
 
-
-
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2012-02-08 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2012-02-08 17:17:20

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2012-02-01 
11:52:35.0 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2012-02-08 
17:17:23.0 +0100
@@ -1,0 +2,5 @@
+Wed Feb  8 11:55:48 UTC 2012 - dval...@suse.com
+
+- fix ppc64 build 
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.G3xMmF/_old  2012-02-08 17:17:25.0 +0100
+++ /var/tmp/diff_new_pack.G3xMmF/_new  2012-02-08 17:17:25.0 +0100
@@ -32,6 +32,7 @@
 BuildRequires:  pm-utils
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  automake
 %if 0%{?suse_version}  1210
 BuildRequires:  sysvinit
 %else
@@ -69,6 +70,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2/dev/null || 
/usr/sbin/apxs -q PREFIX)
 
+
 %description
 Controls and monitors the status of an APC UPS under Linux. Allows your
 computer or server to run for a specified length of time on UPS power
@@ -79,10 +81,13 @@
 http://www.apc.com/tools/download/.
 
 %package gui
+
+
 Summary:APC UPS Monitor GUI (for APC UPSs)
 Group:  Hardware/UPS
 Requires:   %{name} = %{version}
 
+
 %description gui
 Controls and monitors the status of an APC UPS under Linux. Allows your
 computer or server to run for a specified length of time on UPS power
@@ -94,6 +99,8 @@
 
 %prep
 %setup -q
+#This is needed as apcupsd doesn't recognize ppc64 correctly
+cp /usr/share/automake-1.11/config.* ./autoconf/ 
 cp -a %{S:1} platforms/suse/apcupsd.in
 cp -a %{S:2} %{S:4} %{S:5} .
 cp -a %{S:3} apcupsd-early-powerdown
@@ -112,6 +119,7 @@
 %patch10 -p1
 %patch11
 
+
 %build
 # Incomplete:
 #cd autoconf
@@ -139,6 +147,7 @@
--with-cgi-bin=%{apache_serverroot}/cgi-bin
 make %{?_smp_mflags}
 
+
 %install
 %makeinstall
 mkdir -p $RPM_BUILD_ROOT/sbin
@@ -161,6 +170,7 @@
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 cp apcupsd.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.apcupsd
 
+
 %post
 %{fillup_and_insserv apcupsd}
 # HALT_POWERDOWN_INSERT is supported since SuSE Linux 10.1, SLES 10.
@@ -184,9 +194,11 @@
 fi
 fi
 
+
 %preun
 %{stop_on_removal apcupsd}
 
+
 %postun
 # Remove HALT_POWERDOWN_INSERT
 if test $1 -eq 0 -a ! -f /etc/init.d/apcupsd ; then
@@ -204,6 +216,7 @@
 %{restart_on_update apcupsd}
 %{insserv_cleanup}
 
+
 %files
 %defattr(-,root,root)
 %doc apcupsd-early-powerdown COPYING ChangeLog* DISCLAIMER Developers INSTALL 
README.SUSE ReleaseNotes examples/
@@ -240,10 +253,13 @@
 %doc %{_mandir}/man?/*.*
 /var/adm/fillup-templates/sysconfig.*
 
+
 %files gui
 %defattr(-,root,root)
 %{_bindir}/gapcmon
 %{_datadir}/applications/gapcmon.desktop
 %{_datadir}/pixmaps/*.png
 
+
+
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2012-02-01 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2012-02-01 11:52:34

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2011-12-25 
17:33:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2012-02-01 
11:52:35.0 +0100
@@ -1,0 +2,6 @@
+Tue Jan 31 16:25:50 CET 2012 - sbra...@suse.cz
+
+- Mark all files in /etc/apcupsd as config files. Their editing
+  sometimes makes sense (bnc#744358).
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.DxMnxJ/_old  2012-02-01 11:52:36.0 +0100
+++ /var/tmp/diff_new_pack.DxMnxJ/_new  2012-02-01 11:52:36.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package apcupsd
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,8 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+
 Name:   apcupsd
 BuildRequires:  apache2-devel
 BuildRequires:  distribution-release
@@ -78,6 +80,7 @@
 
 %package gui
 Summary:APC UPS Monitor GUI (for APC UPSs)
+Group:  Hardware/UPS
 Requires:   %{name} = %{version}
 
 %description gui
@@ -220,16 +223,16 @@
 /etc/init.d/apcupsd
 /etc/pm/sleep.d/99apcupsd
 %dir %{_sysconfdir}/apcupsd/
-%{_sysconfdir}/apcupsd/apccontrol
-%config(noreplace)%{_sysconfdir}/apcupsd/apcupsd.conf
-%{_sysconfdir}/apcupsd/changeme
-%{_sysconfdir}/apcupsd/commfailure
-%{_sysconfdir}/apcupsd/commok
+%config(noreplace) %{_sysconfdir}/apcupsd/*
+%config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf
+%config(noreplace) %{_sysconfdir}/apcupsd/changeme
+%config(noreplace) %{_sysconfdir}/apcupsd/commfailure
+%config(noreplace) %{_sysconfdir}/apcupsd/commok
 %config(noreplace) %{_sysconfdir}/apcupsd/hosts.conf
 %config(noreplace) %{_sysconfdir}/apcupsd/multimon.conf
-%{_sysconfdir}/apcupsd/onbattery
-%{_sysconfdir}/apcupsd/offbattery
-%{_sysconfdir}/apcupsd/apcupsd.css
+%config(noreplace) %{_sysconfdir}/apcupsd/onbattery
+%config(noreplace) %{_sysconfdir}/apcupsd/offbattery
+%config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.css
 %{apache_serverroot}/cgi-bin/multimon.cgi
 %{apache_serverroot}/cgi-bin/upsfstats.cgi
 %{apache_serverroot}/cgi-bin/upsstats.cgi

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2011-12-25 Thread h_root
Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory checked 
in at 2011-12-25 17:32:58

Comparing /work/SRC/openSUSE:Factory/apcupsd (Old)
 and  /work/SRC/openSUSE:Factory/.apcupsd.new (New)


Package is apcupsd, Maintainer is sbra...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes  2011-10-18 
14:08:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2011-12-25 
17:33:01.0 +0100
@@ -1,0 +2,5 @@
+Tue Dec 20 11:26:20 UTC 2011 - co...@suse.com
+
+- remove call to suse_update_config (very old work around)
+
+---



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.pMrokp/_old  2011-12-25 17:33:02.0 +0100
+++ /var/tmp/diff_new_pack.pMrokp/_new  2011-12-25 17:33:02.0 +0100
@@ -15,20 +15,31 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:   apcupsd
-BuildRequires:  apache2-devel distribution-release dos2unix gcc-c++ 
gconf2-devel gd-devel gnome-vfs2-devel gtk2-devel mailx ncurses-devel 
net-snmp-devel pm-utils tcpd-devel update-desktop-files
+BuildRequires:  apache2-devel
+BuildRequires:  distribution-release
+BuildRequires:  dos2unix
+BuildRequires:  gcc-c++
+BuildRequires:  gconf2-devel
+BuildRequires:  gd-devel
+BuildRequires:  gnome-vfs2-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  mailx
+BuildRequires:  ncurses-devel
+BuildRequires:  net-snmp-devel
+BuildRequires:  pm-utils
+BuildRequires:  tcpd-devel
+BuildRequires:  update-desktop-files
 %if 0%{?suse_version}  1210
 BuildRequires:  sysvinit
 %else
 BuildRequires:  sysvinit-init
 %endif
-Group:  Hardware/UPS
-License:GPL-2.0+
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
+License:GPL-2.0+
+Group:  Hardware/UPS
 Version:3.14.8
-Release:5
+Release:0
 Url:http://www.apcupsd.com/
 Source: apcupsd-%{version}.tar.bz2
 Source1:apcupsd.init
@@ -66,8 +77,6 @@
 http://www.apc.com/tools/download/.
 
 %package gui
-License:GPL-2.0+
-Group:  Hardware/UPS
 Summary:APC UPS Monitor GUI (for APC UPSs)
 Requires:   %{name} = %{version}
 
@@ -101,7 +110,6 @@
 %patch11
 
 %build
-%{suse_update_config autoconf}
 # Incomplete:
 #cd autoconf
 #aclocal

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2011-09-19 Thread h_root

Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory
checked in at Mon Sep 19 15:37:14 CEST 2011.




--- apcupsd/apcupsd.changes 2011-08-26 13:54:40.0 +0200
+++ /mounts/work_src_done/STABLE/apcupsd/apcupsd.changes2011-09-17 
13:23:47.0 +0200
@@ -1,0 +2,6 @@
+Sat Sep 17 11:23:44 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+
+---

calling whatdependson for head-i586




Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.ffuJgq/_old  2011-09-19 15:37:10.0 +0200
+++ /var/tmp/diff_new_pack.ffuJgq/_new  2011-09-19 15:37:10.0 +0200
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:   apcupsd
@@ -110,7 +109,7 @@
--enable-usb\
--enable-nls\
--with-cgi-bin=%{apache_serverroot}/cgi-bin
-make %{?jobs:-j %jobs}
+make %{?_smp_mflags}
 cp -a src/apcupsd src/apcupsd-lite
 make clean
 %configure\
@@ -119,7 +118,7 @@
--enable-all\
--enable-nls\
--with-cgi-bin=%{apache_serverroot}/cgi-bin
-make %{?jobs:-j %jobs}
+make %{?_smp_mflags}
 
 %install
 %makeinstall
@@ -186,9 +185,6 @@
 %{restart_on_update apcupsd}
 %{insserv_cleanup}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %doc apcupsd-early-powerdown COPYING ChangeLog* DISCLAIMER Developers INSTALL 
README.SUSE ReleaseNotes examples/






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2011-08-29 Thread h_root

Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory
checked in at Mon Aug 29 11:01:02 CEST 2011.




--- apcupsd/apcupsd.changes 2011-08-02 18:02:00.0 +0200
+++ /mounts/work_src_done/STABLE/apcupsd/apcupsd.changes2011-08-26 
13:54:40.0 +0200
@@ -1,0 +2,5 @@
+Thu Aug 25 20:02:35 CEST 2011 - sbra...@suse.cz
+
+- Implemented hibernate on power fail (bnc#703592#c39).
+
+---

calling whatdependson for head-i586


New:

  apcupsd-hibernate.patch
  apcupsd.hibernate
  apcupsd.sysconfig



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.0Jwxab/_old  2011-08-29 10:55:12.0 +0200
+++ /var/tmp/diff_new_pack.0Jwxab/_new  2011-08-29 10:55:12.0 +0200
@@ -19,21 +19,25 @@
 
 
 Name:   apcupsd
-BuildRequires:  apache2-devel distribution-release dos2unix gcc-c++ 
gconf2-devel gd-devel gnome-vfs2-devel gtk2-devel mailx ncurses-devel 
net-snmp-devel sysvinit tcpd-devel update-desktop-files
+BuildRequires:  apache2-devel distribution-release dos2unix gcc-c++ 
gconf2-devel gd-devel gnome-vfs2-devel gtk2-devel mailx ncurses-devel 
net-snmp-devel pm-utils sysvinit tcpd-devel update-desktop-files
 Group:  Hardware/UPS
 License:GPLv2+
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
 Version:3.14.8
-Release:3
+Release:5
 Url:http://www.apcupsd.com/
 Source: apcupsd-%{version}.tar.bz2
 Source1:apcupsd.init
 Source2:README.SUSE
 Source3:apcupsd-early-powerdown.init
+Source4:apcupsd.hibernate
+Source5:apcupsd.sysconfig
 # PATCH-FIX-OPENSUSE apcupsd-suse.patch sbra...@suse.cz -- Do not perform halt 
script alternation on install.
 Patch:  apcupsd-suse.patch
 # PATCH-FIX-OPENSUSE apcupsd-gpp.patch sbra...@suse.cz -- Build against C++ 
unfriendly system tcpd.h. See below.
 Patch1: apcupsd-gpp.patch
+# PATCH-FEATURE-OPENSUSE apcupsd-hibernate.patch sbra...@suse.cz -- Support 
for hibernation on powerfail.
+Patch2: apcupsd-hibernate.patch
 # PATCH-FEATURE-OPENSUSE apcupsd-powersave.patch sbra...@suse.cz -- Call 
powersave-notify in distros where it is available.
 Patch3: apcupsd-powersave.patch
 # PATCH-FIX-OPENSUSE apcupsd-largebuf-overflow.patch sbra...@suse.cz -- Fix 
static buffer overflow.
@@ -73,13 +77,14 @@
 %prep
 %setup -q
 cp -a %{S:1} platforms/suse/apcupsd.in
-cp -a %{S:2} .
+cp -a %{S:2} %{S:4} %{S:5} .
 cp -a %{S:3} apcupsd-early-powerdown
 chmod +x apcupsd-early-powerdown
 %patch
 # To be surely in sync with tcpd API, build against system header. It requires 
a patch.
 rm include/tcpd.h
 %patch1
+%patch2
 %if %suse_version  1110
 %patch3
 %endif
@@ -132,6 +137,11 @@
 %if %suse_version  1130
 rm -r $RPM_BUILD_ROOT/usr/share/hal
 %endif
+mkdir -p $RPM_BUILD_ROOT/etc/pm/sleep.d
+sed s:@PWRFAILDIR@:%{_sysconfdir}/apcupsd:g apcupsd.hibernate 
$RPM_BUILD_ROOT/etc/pm/sleep.d/99apcupsd
+chmod +x $RPM_BUILD_ROOT/etc/pm/sleep.d/99apcupsd
+mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
+cp apcupsd.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.apcupsd
 
 %post
 %{fillup_and_insserv apcupsd}
@@ -196,6 +206,7 @@
 %{_sbindir}/rcapcupsd
 %{_sbindir}/smtp
 /etc/init.d/apcupsd
+/etc/pm/sleep.d/99apcupsd
 %dir %{_sysconfdir}/apcupsd/
 %{_sysconfdir}/apcupsd/apccontrol
 %config(noreplace)%{_sysconfdir}/apcupsd/apcupsd.conf
@@ -212,6 +223,7 @@
 %{apache_serverroot}/cgi-bin/upsstats.cgi
 %{apache_serverroot}/cgi-bin/upsimage.cgi
 %doc %{_mandir}/man?/*.*
+/var/adm/fillup-templates/sysconfig.*
 
 %files gui
 %defattr(-,root,root)

++ README.SUSE ++
--- /var/tmp/diff_new_pack.0Jwxab/_old  2011-08-29 10:55:12.0 +0200
+++ /var/tmp/diff_new_pack.0Jwxab/_new  2011-08-29 10:55:12.0 +0200
@@ -6,15 +6,15 @@
 If you want to configure nut to do suspend to disk instead of shutdown
 you should:
 
-- Verify, that suspend to disk works correctly with your desktop:
-  shutdown -z +0
-  (You can lose your unsaved data, if your computer does not support
-  suspend.)
-
-- Properly edit your /etc/apcupsd/apccontrol: Replace -h by -z in
-  shutdown command parameters.
-- Verify, that your UPS provides reasonable grant period to complete
-  suspend in all situations.
+- You need pm-utils package installed.
+- Verify, that suspend to disk works correctly on your machine,
+  e. g. by pm-hibernate
+  (You can lose your unsaved data, if your computer does not hibernate
+  correctly.)
+- Verify, that your UPS provides reasonable grace period to complete
+  hibernation in all situations.
+- Use YaST Sysconfig editor and set
+  Hardware-UPS-APCUPSD_POWERFAIL_BEHAVIOR to hibernate.
 
 
 Environment with possible service timeouts

++ apcupsd-hibernate.patch ++
--- platforms/apccontrol.in
+++ 

commit apcupsd for openSUSE:Factory

2011-08-03 Thread h_root

Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory
checked in at Wed Aug 3 09:41:24 CEST 2011.




--- apcupsd/apcupsd.changes 2011-07-04 21:06:29.0 +0200
+++ /mounts/work_src_done/STABLE/apcupsd/apcupsd.changes2011-08-02 
18:02:00.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug  2 17:40:15 CEST 2011 - sbra...@suse.cz
+
+- Fixed init check to succeed with unmounted /usr (bnc#703592#c23).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.rWcH4r/_old  2011-08-03 09:37:16.0 +0200
+++ /var/tmp/diff_new_pack.rWcH4r/_new  2011-08-03 09:37:16.0 +0200
@@ -24,7 +24,7 @@
 License:GPLv2+
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
 Version:3.14.8
-Release:1
+Release:3
 Url:http://www.apcupsd.com/
 Source: apcupsd-%{version}.tar.bz2
 Source1:apcupsd.init
@@ -80,7 +80,7 @@
 # To be surely in sync with tcpd API, build against system header. It requires 
a patch.
 rm include/tcpd.h
 %patch1
-%if %suse_version = 1110
+%if %suse_version  1110
 %patch3
 %endif
 chmod -x kernstodo

++ apcupsd.init ++
--- /var/tmp/diff_new_pack.rWcH4r/_old  2011-08-03 09:37:16.0 +0200
+++ /var/tmp/diff_new_pack.rWcH4r/_new  2011-08-03 09:37:16.0 +0200
@@ -27,7 +27,7 @@
 
 APCUPSD=@sbindir@/apcupsd
 APCUPSD_LITE=/sbin/apcupsd-lite
-test -x $APCUPSD -a -x $APCUPSD_LITE || exit 5
+test -r @sysconfdir@/apcupsd.conf -a -x $APCUPSD_LITE || exit 5
 
 # Shell functions sourced from /etc/rc.status:
 #  rc_check check and set local and overall rc status






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit apcupsd for openSUSE:Factory

2011-07-05 Thread h_root

Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory
checked in at Tue Jul 5 11:02:52 CEST 2011.




--- apcupsd/apcupsd.changes 2011-03-24 16:36:06.0 +0100
+++ /mounts/work_src_done/STABLE/apcupsd/apcupsd.changes2011-07-04 
21:06:29.0 +0200
@@ -1,0 +2,15 @@
+Mon Jul  4 20:36:19 CEST 2011 - sbra...@suse.cz
+
+- Updated to version 3.14.8:
+  * Implement battery calibration and self-test interval in apctest
+for USB models.
+  * Add support for turning the UPS off completely.
+  * Updates of SNMP code.
+  * Add support for reading battery voltage from the PowerSummary.
+  * Switch time/date output format to simplified ISO.
+  * Compilation warning fixes.
+  * Other bug fixes and improvements.
+  * Documentation improvements.
+- Removed HAL support.
+
+---
@@ -4,0 +20 @@
+  (reported later as bnc#703592)

calling whatdependson for head-i586


Old:

  apcupsd-3.14.5-const.patch
  apcupsd-3.14.6.tar.bz2

New:

  apcupsd-3.14.8.tar.bz2



Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.R5zxtA/_old  2011-07-05 10:50:44.0 +0200
+++ /var/tmp/diff_new_pack.R5zxtA/_new  2011-07-05 10:50:44.0 +0200
@@ -19,23 +19,26 @@
 
 
 Name:   apcupsd
-BuildRequires:  apache2-devel distribution-release dos2unix gcc-c++ 
gconf2-devel gd-devel gnome-vfs2-devel gtk2-devel mailx ncurses-devel 
net-snmp-devel tcpd-devel update-desktop-files
-BuildRequires:  sysvinit
+BuildRequires:  apache2-devel distribution-release dos2unix gcc-c++ 
gconf2-devel gd-devel gnome-vfs2-devel gtk2-devel mailx ncurses-devel 
net-snmp-devel sysvinit tcpd-devel update-desktop-files
 Group:  Hardware/UPS
 License:GPLv2+
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
-Version:3.14.6
-Release:15
+Version:3.14.8
+Release:1
 Url:http://www.apcupsd.com/
 Source: apcupsd-%{version}.tar.bz2
 Source1:apcupsd.init
 Source2:README.SUSE
 Source3:apcupsd-early-powerdown.init
+# PATCH-FIX-OPENSUSE apcupsd-suse.patch sbra...@suse.cz -- Do not perform halt 
script alternation on install.
 Patch:  apcupsd-suse.patch
+# PATCH-FIX-OPENSUSE apcupsd-gpp.patch sbra...@suse.cz -- Build against C++ 
unfriendly system tcpd.h. See below.
 Patch1: apcupsd-gpp.patch
+# PATCH-FEATURE-OPENSUSE apcupsd-powersave.patch sbra...@suse.cz -- Call 
powersave-notify in distros where it is available.
 Patch3: apcupsd-powersave.patch
+# PATCH-FIX-OPENSUSE apcupsd-largebuf-overflow.patch sbra...@suse.cz -- Fix 
static buffer overflow.
 Patch5: apcupsd-largebuf-overflow.patch
-Patch8: apcupsd-3.14.5-const.patch
+# PATCH-FIX-OPENSUSE apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff 
se...@opensuse.org -- Fix build with newer net-snmp by undefining MIB.
 Patch9: apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff
 Patch10:apcupsd-3.14.1-cloexec.patch
 PreReq: %fillup_prereq %insserv_prereq /usr/bin/sed /usr/bin/grep
@@ -69,17 +72,19 @@
 
 %prep
 %setup -q
-rm include/tcpd.h
 cp -a %{S:1} platforms/suse/apcupsd.in
 cp -a %{S:2} .
 cp -a %{S:3} apcupsd-early-powerdown
 chmod +x apcupsd-early-powerdown
 %patch
+# To be surely in sync with tcpd API, build against system header. It requires 
a patch.
+rm include/tcpd.h
 %patch1
+%if %suse_version = 1110
 %patch3
+%endif
 chmod -x kernstodo
 %patch5
-%patch8
 %patch9
 %patch10 -p1
 
@@ -124,6 +129,9 @@
 # fix end-of-line encoding
 dos2unix -o examples/status/SmartUPS-vs-650.status examples/snoopdecode.c 
examples/rpt/Smart-UPS-1500.rpt \
examples/rpt/Back-UPS-ES-550.rpt examples/rpt/Back-UPS-CS-650.rpt 
examples/rpt/Back-UPS-BR-800.rpt
+%if %suse_version  1130
+rm -r $RPM_BUILD_ROOT/usr/share/hal
+%endif
 
 %post
 %{fillup_and_insserv apcupsd}
@@ -173,13 +181,15 @@
 
 %files
 %defattr(-,root,root)
-%doc apcupsd-early-powerdown COPYING ChangeLog* DISCLAIMER Developers INSTALL 
README.SUSE ReleaseNotes kernstodo examples/
+%doc apcupsd-early-powerdown COPYING ChangeLog* DISCLAIMER Developers INSTALL 
README.SUSE ReleaseNotes examples/
 /sbin/apcupsd-lite
+%if %suse_version = 1130
 %dir %{_datadir}/hal
 %dir %{_datadir}/hal/fdi
 %dir %{_datadir}/hal/fdi/policy
 %dir %{_datadir}/hal/fdi/policy/20thirdparty
 %{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
+%endif
 %{_sbindir}/apcupsd
 %{_sbindir}/apcaccess
 %{_sbindir}/apctest

++ apcupsd-3.14.6.tar.bz2 - apcupsd-3.14.8.tar.bz2 ++
 522762 lines of diff (skipped)

++ apcupsd-gpp.patch ++
--- /var/tmp/diff_new_pack.R5zxtA/_old  2011-07-05 10:50:45.0 +0200
+++ /var/tmp/diff_new_pack.R5zxtA/_new  2011-07-05 10:50:45.0 +0200
@@ -1,9 +1,11 @@
 This patch is required to work correctly with system tcpd.h, i. e. with
 rm 

commit apcupsd for openSUSE:Factory

2011-03-25 Thread h_root

Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory
checked in at Fri Mar 25 09:13:31 CET 2011.




--- apcupsd/apcupsd.changes 2010-07-27 22:12:37.0 +0200
+++ /mounts/work_src_done/STABLE/apcupsd/apcupsd.changes2011-03-24 
16:36:06.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar 24 15:34:50 UTC 2011 - vci...@novell.com
+
+- fixed apcupsd-lite path in init script 
+
+---

calling whatdependson for head-i586




Other differences:
--
++ apcupsd.spec ++
--- /var/tmp/diff_new_pack.B2hRXb/_old  2011-03-25 09:13:19.0 +0100
+++ /var/tmp/diff_new_pack.B2hRXb/_new  2011-03-25 09:13:19.0 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package apcupsd (Version 3.14.6)
+# spec file for package apcupsd
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 License:GPLv2+
 Summary:APC UPS Daemon (Powerful Daemon for APC UPSs)
 Version:3.14.6
-Release:11
+Release:15
 Url:http://www.apcupsd.com/
 Source: apcupsd-%{version}.tar.bz2
 Source1:apcupsd.init

++ apcupsd.init ++
--- /var/tmp/diff_new_pack.B2hRXb/_old  2011-03-25 09:13:19.0 +0100
+++ /var/tmp/diff_new_pack.B2hRXb/_new  2011-03-25 09:13:19.0 +0100
@@ -26,7 +26,7 @@
 ### END INIT INFO
 
 APCUPSD=@sbindir@/apcupsd
-APCUPSD_LITE=@sbindir@/apcupsd-lite
+APCUPSD_LITE=/sbin/apcupsd-lite
 test -x $APCUPSD -o -x $APCUPSD_LITE || exit 5
 
 # Shell functions sourced from /etc/rc.status:






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org