Hello community,
here is the log from the commit of package spacenavd for openSUSE:Factory
checked in at 2020-04-07 10:27:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spacenavd (Old)
and /work/SRC/openSUSE:Factory/.spacenavd.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spacenavd"
Tue Apr 7 10:27:42 2020 rev:6 rq:790486 version:0.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/spacenavd/spacenavd.changes 2019-03-26
15:43:40.872200729 +0100
+++ /work/SRC/openSUSE:Factory/.spacenavd.new.3248/spacenavd.changes
2020-04-07 10:28:25.398302926 +0200
@@ -1,0 +2,31 @@
+Tue Mar 31 15:36:18 UTC 2020 - Herbert Graeber <herb...@graeber-clan.de>
+
+- Remove unnecessary _service file
+
+-------------------------------------------------------------------
+Sun Mar 22 17:19:36 UTC 2020 - Herbert Graeber <herb...@graeber-clan.de>
+
+- Fix pidfile (/var/run -> /run)
+
+-------------------------------------------------------------------
+Sun Mar 22 12:30:44 UTC 2020 - Herbert Graeber <herb...@graeber-clan.de>
+
+- Bugfix release 0.7.1
+ * fixed build on gcc 10
+ * fixed configure script which failed to detect the version number correctly
+ in release 0.7, incorrectly trying to rely on git to do so.
+- remove support for pre-systemd openSUSE releases
+- remove patch spacenavd-add-blacklist-and-device-ids.patch
+- remove patch spacenavd-add-missing-usbid.patch
+- remove patch spacenavd-0.6+git3066072.patch
+- remove patch spacenavd-fix-pidfile.patch
+- Release 0.7
+ * implemented the ability to log to syslog.
+ * ignore joystick devices when searching for USB devices (linux).
+ * added code to attempt to wrestle devices from the X server.
+ * added the new 3Dconnexion vendor id to the device matching logic.
+ * made builds reproducible by linking in alphabetical order.
+ * added option led = auto, to turn the LED on only when a client connects
(linux).
+ * implemented a blacklist of USB device ids that should be ignored.
+
+-------------------------------------------------------------------
Old:
----
spacenavd-0.6+git3066072.patch
spacenavd-0.6.tar.gz
spacenavd-add-blacklist-and-device-ids.patch
spacenavd-add-missing-usbid.patch
New:
----
spacenavd-0.7.1.tar.gz
spacenavd-fix-pidfile.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spacenavd.spec ++++++
--- /var/tmp/diff_new_pack.SAnVDX/_old 2020-04-07 10:28:26.274303901 +0200
+++ /var/tmp/diff_new_pack.SAnVDX/_new 2020-04-07 10:28:26.278303905 +0200
@@ -1,7 +1,7 @@
#
# spec file for package spacenavd
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2009,2011,2013 Herbert Graeber
#
# All modifications and additions to the file contributed by third parties
@@ -17,30 +17,23 @@
#
-%if 0%{?suse_version} > 1140
-%define has_systemd 1
-BuildRequires: systemd-rpm-macros
-%{?systemd_requires}
-%endif
Name: spacenavd
-Version: 0.6
+Version: 0.7.1
Release: 0
Summary: Daemon for 3Dconnexion devices
License: GPL-3.0-or-later
Group: Hardware/Other
URL: http://spacenav.sourceforge.net
-Source:
https://github.com/FreeSpacenav/%{name}/archive/%{name}-%{version}.tar.gz
+Source:
https://github.com/FreeSpacenav/spacenavd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: spacenavd.8.gz
Source2: spnavrc
Source3: xinitrc-%{name}
Source4: %{name}.service
-Patch1: spacenavd-0.6+git3066072.patch
-# PATCH-FIX-UPSTREAM spacenavd-add-blacklist-and-device-ids.patch #4
-Patch2: spacenavd-add-blacklist-and-device-ids.patch
-# PATCH-FIX-UPSTREAM spacenavd-add-missing-usbid.patch #12
-Patch3: spacenavd-add-missing-usbid.patch
+Patch1: %{name}-fix-pidfile.patch
BuildRequires: pkgconfig
+BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(x11)
+%{?systemd_requires}
Requires: xdpyinfo
Supplements: modalias(usb:v046DpC603d*dc*dsc*dp*ic*isc*ip*)
Supplements: modalias(usb:v046DpC605d*dc*dsc*dp*ic*isc*ip*)
@@ -63,10 +56,8 @@
any program that was written for the 3Dconnexion driver.
%prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
%configure
@@ -80,35 +71,20 @@
install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/spnavrc
install -D -m 755 %{SOURCE3}
%{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/%{name}
ln -sf service %{buildroot}%{_sbindir}/rc%{name}
-%if 0%{?has_systemd}
install -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service
-%endif
%post
%fillup_only -n %{name}
-%if 0%{?has_systemd}
%service_add_post %{name}.service
-%endif
%postun
-%if 0%{?has_systemd}
%service_del_postun %{name}.service
-%else
-%restart_on_update %{name}
-%insserv_cleanup
-%endif
%pre
-%if 0%{?has_systemd}
%service_add_pre %{name}.service
-%endif
%preun
-%if 0%{?has_systemd}
%service_del_preun %{name}.service
-%else
-%stop_on_removal %{name}
-%endif
%files
%license COPYING
@@ -117,9 +93,7 @@
%{_sbindir}/rc%{name}
%{_bindir}/spnavd_ctl
%config(noreplace) %{_sysconfdir}/spnavrc
-%if 0%{?has_systemd}
%{_unitdir}/%{name}.service
-%endif
%{_mandir}/man8/spacenavd.8%{?ext_man}
%{_mandir}/man8/spnavd_ctl.8%{?ext_man}
%{_sysconfdir}/X11/xinit/
++++++ spacenavd-0.6.tar.gz -> spacenavd-0.7.1.tar.gz ++++++
++++ 2569 lines of diff (skipped)
++++++ spacenavd-fix-pidfile.patch ++++++
diff -up spacenavd-0.7.1/contrib/systemd/spacenavd.service.fix-pidfile
spacenavd-0.7.1/contrib/systemd/spacenavd.service
--- spacenavd-0.7.1/contrib/systemd/spacenavd.service.fix-pidfile
2020-03-22 16:10:42.581821273 +0100
+++ spacenavd-0.7.1/contrib/systemd/spacenavd.service 2020-03-22
16:11:49.253400708 +0100
@@ -4,7 +4,7 @@ After=syslog.target
[Service]
Type=forking
-PIDFile=/var/run/spnavd.pid
+PIDFile=/run/spnavd.pid
ExecStart=/usr/bin/spacenavd
StandardError=syslog
diff -up spacenavd-0.7.1/init_script.fix-pidfile spacenavd-0.7.1/init_script
--- spacenavd-0.7.1/init_script.fix-pidfile 2020-03-22 16:10:57.213842900
+0100
+++ spacenavd-0.7.1/init_script 2020-03-22 16:12:08.165156918 +0100
@@ -30,7 +30,7 @@ start)
stop)
echo 'Stopping spacenavd daemon'
# detect daemon's process id
- pid=`cat /var/run/spnavd.pid 2>/dev/null`
+ pid=`cat /run/spnavd.pid 2>/dev/null`
if [ $? != 0 ]; then
pid=`ps -e | grep spacenavd | awk '{ print $1 }'`
if [ -z "$pid" ]; then
diff -up spacenavd-0.7.1/spnavd_ctl.fix-pidfile spacenavd-0.7.1/spnavd_ctl
--- spacenavd-0.7.1/spnavd_ctl.fix-pidfile 2020-03-22 16:11:13.009768437
+0100
+++ spacenavd-0.7.1/spnavd_ctl 2020-03-22 16:12:34.904713390 +0100
@@ -32,7 +32,7 @@ else
fi
# detect daemon's process id
-pid=`cat /var/run/spnavd.pid 2>/dev/null`
+pid=`cat /run/spnavd.pid 2>/dev/null`
if [ $? != 0 ]; then
pid=`ps -e | grep spacenavd | awk '{ print $1 }'`
if [ -z "$pid" ]; then
diff -up spacenavd-0.7.1/src/spnavd.h.fix-pidfile spacenavd-0.7.1/src/spnavd.h
--- spacenavd-0.7.1/src/spnavd.h.fix-pidfile 2020-03-22 16:11:26.161657639
+0100
+++ spacenavd-0.7.1/src/spnavd.h 2020-03-22 16:14:26.920758060 +0100
@@ -26,8 +26,8 @@ along with this program. If not, see <h
#define DEF_CFGFILE "/etc/spnavrc"
#define DEF_LOGFILE "/var/log/spnavd.log"
-#define SOCK_NAME "/var/run/spnav.sock"
-#define PIDFILE "/var/run/spnavd.pid"
+#define SOCK_NAME "/run/spnav.sock"
+#define PIDFILE "/run/spnavd.pid"
#define SYSLOG_ID "spnavd"
/* Multiple devices support */
++++++ spacenavd.service ++++++
--- /var/tmp/diff_new_pack.SAnVDX/_old 2020-04-07 10:28:26.386304025 +0200
+++ /var/tmp/diff_new_pack.SAnVDX/_new 2020-04-07 10:28:26.390304029 +0200
@@ -3,7 +3,7 @@
[Service]
Type=forking
-PIDFile=/var/run/spnavd.pid
+PIDFile=/run/spnavd.pid
ExecStart=/usr/sbin/spacenavd
StandardError=syslog
