Hello community,
here is the log from the commit of package aiccu for openSUSE:Factory checked in at 2015-01-06 09:06:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aiccu (Old)
and /work/SRC/openSUSE:Factory/.aiccu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aiccu"
Changes:
--------
--- /work/SRC/openSUSE:Factory/aiccu/aiccu.changes 2014-10-26 00:56:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.aiccu.new/aiccu.changes 2015-01-06 09:06:52.000000000 +0100
@@ -1,0 +2,6 @@
+Sun Jan 4 12:45:51 UTC 2015 - mpluskal@suse.com
+
+- Add aiccu-systemd.dif and update unit file to use sd_notify
+- Small spec file cleanups
+
+-------------------------------------------------------------------
New:
----
aiccu-systemd.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aiccu.spec ++++++
--- /var/tmp/diff_new_pack.uAv9eb/_old 2015-01-06 09:06:53.000000000 +0100
+++ /var/tmp/diff_new_pack.uAv9eb/_new 2015-01-06 09:06:53.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package aiccu
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -30,6 +30,7 @@
Patch1: %{name}_%{version}-sigaction.dif
Patch2: aiccu-linkorder.dif
Patch3: aiccu-pthread.dif
+Patch4: aiccu-systemd.dif
BuildRequires: gnutls-devel
Requires: iproute2
Requires: iputils
@@ -37,11 +38,11 @@
Requires: net-tools
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1210
+BuildRequires: pkg-config
BuildRequires: systemd
+BuildRequires: systemd-devel
+BuildRequires: pkgconfig(systemd)
%systemd_requires
-%else
-# FIXME: use proper Requires(pre/post/preun/...)
-PreReq: %insserv_prereq
%endif
%description
@@ -59,14 +60,20 @@
%patch1
%patch2
%patch3
+%if 0%{?suse_version} >= 1210
+%patch4
+%endif
%build
%if 0%{?suse_version} >= 1010
RPM_OPT_FLAGS="%{optflags} -fPIE -pie"
%endif
export RPM_OPT_FLAGS
-make clean
-make %{?_smp_mflags} CC=gcc
+%if 0%{?suse_version} > 1210
+make HAVE_SYSTEMD=1 %{?_smp_mflags}
+%else
+make %{?_smp_mflags}
+%endif
%install
export RPM_SOURCE_DIR
@@ -76,7 +83,7 @@
install -m0755 -d %{buildroot}/%{_mandir}/man1
chmod 0644 doc/*
-make install DESTDIR=%{buildroot} dirdoc=%{_defaultdocdir}/%{name}/
+make install DESTDIR=%{buildroot} dirdoc=%{_defaultdocdir}/%{name}/ %{?_smp_mflags}
install -m0644 doc/aiccu.1 \
%{buildroot}/%{_mandir}/man1/
++++++ aiccu-systemd.dif ++++++
diff -Naur unix-console.orig/Makefile unix-console/Makefile
--- unix-console.orig/Makefile 2015-01-04 12:18:12.360923141 +0000
+++ unix-console/Makefile 2015-01-04 12:18:36.125619633 +0000
@@ -51,6 +51,10 @@
SRCS += ../common/aiccu_linux.c
OBJS += ../common/aiccu_linux.o
LDFLAGS += -lresolv
+ifeq (1,$(HAVE_SYSTEMD))
+LDFLAGS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon)
+CFLAGS += -DHAVE_SYSTEMD
+endif
endif
# FreeBSD
diff -Naur unix-console.orig/main.c unix-console/main.c
--- unix-console.orig/main.c 2015-01-04 12:18:12.360923141 +0000
+++ unix-console/main.c 2015-01-04 12:19:52.451856589 +0000
@@ -12,6 +12,9 @@
#include "../common/aiccu.h"
#include "../common/tun.h"
+#ifdef HAVE_SYSTEMD
+#include