Hello community,
here is the log from the commit of package acpid for openSUSE:Factory
checked in at Sun Oct 3 22:43:18 CEST 2010.
--------
--- acpid/acpid.changes 2009-09-21 16:10:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/acpid/acpid.changes 2010-10-02 21:50:44.000000000 +0200
@@ -1,0 +2,18 @@
+Sat Oct 2 19:49:08 UTC 2010 - aj@suse.de
+
+- Add systemd configuration.
+- Always fork, even if called from PID 1.
+
+-------------------------------------------------------------------
+Sat Oct 2 19:27:50 UTC 2010 - aj@suse.de
+
+- Update to version 2.0.6:
+ * cleanup of code and build infrastructure
+ * Support netlink and input layer
+
+-------------------------------------------------------------------
+Sat Oct 2 19:26:45 UTC 2010 - aj@suse.de
+
+- Split up acpi in its own package.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
acpi-0.09.tar.bz2
acpi_0.09.dif
acpid-1.0.10.tar.gz
New:
----
acpid-2.0.5-forking.patch
acpid-2.0.6.tar.gz
acpid-makefile.patch
acpid.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ acpid.spec ++++++
--- /var/tmp/diff_new_pack.TS3WFG/_old 2010-10-03 22:42:39.000000000 +0200
+++ /var/tmp/diff_new_pack.TS3WFG/_new 2010-10-03 22:42:39.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package acpid (Version 1.0.10)
+# spec file for package acpid (Version 2.0.6)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -19,17 +19,15 @@
Name: acpid
-Url: http://acpid.sourceforge.net/
-Version: 1.0.10
-Release: 3
-%define acpi_version 0.09
-License: GPL v2 or later
+Url: http://tedfelix.com/linux/acpid-netlink.html
+Version: 2.0.6
+Release: 1
+License: GPLv2+
Group: System/Daemons
AutoReqProv: on
PreReq: %insserv_prereq %fillup_prereq
Summary: Executes Actions at ACPI Events
Source: %{name}-%{version}.tar.gz
-Source1: acpi-%{acpi_version}.tar.bz2
Source2: rcacpid
Source3: README.SuSE
Source4: thinkpad_acpi.modprobe
@@ -37,7 +35,9 @@
Source9: events.thinkpad
Source6: thinkpad_handler
Source7: power_button
-Patch1: acpi_%{acpi_version}.dif
+Source8: acpid.service
+Patch1: acpid-makefile.patch
+Patch2: acpid-2.0.5-forking.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ia64
@@ -56,23 +56,19 @@
Andrew Grover
Tim Hockin
Cajus Pollmeier
+ Ted Felix
%prep
-%setup -b 0 -a 1
-%patch1
-pushd acpi-%{acpi_version}
-popd
+%setup -q
+%patch1 -p0
+%patch2 -p1
cp %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:9} .
%build
-pushd acpi-%{acpi_version}
-ln -sf /usr/share/automake*/install-sh install-sh
-./configure
-make CFLAGS="$RPM_OPT_FLAGS"
-popd
+make OPT="$RPM_OPT_FLAGS" %{?_smp_mflags}
%install
-make install INSTPREFIX=%{buildroot} SBINDIR=%{buildroot}/sbin
+make install DESTDIR=$RPM_BUILD_ROOT SBINDIR=/sbin
install -Dm 744 rcacpid %{buildroot}/etc/init.d/acpid
install -Dm 644 thinkpad_acpi.modprobe %{buildroot}/etc/modprobe.d/50-thinkpad_acpi.conf
install -Dm 744 thinkpad_handler %{buildroot}/usr/lib/acpid/thinkpad_handler
@@ -81,11 +77,9 @@
ln -sf ../../etc/init.d/acpid %{buildroot}/usr/sbin/rcacpid
install -Dm 644 events.power_button %{buildroot}/etc/acpi/events/power_button
install -Dm 644 events.thinkpad %{buildroot}/etc/acpi/events/thinkpad
-pushd acpi-%{acpi_version}
-ln -sf /usr/share/automake*/mkinstalldirs mkinstalldirs
-make prefix=%{buildroot}/usr install
-install -Dm 644 acpi.1 %{buildroot}/%{_mandir}/man1/acpi.1
-popd
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/lib/systemd/system
+
# for the rpmlint fascists
mv samples examples
# keep the logfile
@@ -115,14 +109,13 @@
/usr/lib/acpid
/etc/init.d/acpid
/etc/modprobe.d/50-thinkpad_acpi.conf
+/lib/systemd/system/%{name}.service
/usr/sbin/rcacpid
/sbin/acpid
/usr/bin/acpi_listen
%doc README.SuSE README Changelog examples
/usr/share/man/man8/acpid.8.gz
/usr/share/man/man8/acpi_listen.8.gz
-/usr/bin/acpi
-/usr/share/man/man1/acpi.1.gz
%ghost %config(noreplace,missingok) %_var/log/acpid
%changelog
++++++ acpid-2.0.5-forking.patch ++++++
diff -up acpid-2.0.5/acpid.c.forking acpid-2.0.5/acpid.c
--- acpid-2.0.5/acpid.c.forking 2010-03-28 15:54:23.000000000 +0200
+++ acpid-2.0.5/acpid.c 2010-09-10 13:38:06.207131183 +0200
@@ -333,7 +333,7 @@ daemonize(void)
pid_t pid, sid;
/* already a daemon */
- if ( getppid() == 1 ) return 0;
+ //if ( getppid() == 1 ) return 0;
/* fork off the parent process */
pid = fork();
++++++ acpid-1.0.10.tar.gz -> acpid-2.0.6.tar.gz ++++++
++++ 8483 lines of diff (skipped)
++++++ acpid-makefile.patch ++++++
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -49,7 +49,7 @@ install_docs:
for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done
cp -a samples $(DESTDIR)/$(DOCDIR)
-install: $(PROGS) man install_docs
+install: $(PROGS) man
mkdir -p $(DESTDIR)/$(SBINDIR)
mkdir -p $(DESTDIR)/$(BINDIR)
install -m 0750 acpid $(DESTDIR)/$(SBINDIR)
++++++ acpid.service ++++++
[Unit]
Description=ACPI Event Daemon
After=syslog.target
# This could probably benefit from socket activation, but honestly I think it
# is time for acpid to go away, and hence I am not planning to spend the time
# to add socket activation here. We use Type=forking to ensure that the
# communication sockets are in place before boot proceeds with any service
# needing this service. Would acpid support socket activation we could use
# Type=simple here.
[Service]
Type=forking
ExecStart=/usr/sbin/acpid
[Install]
WantedBy=multi-user.target
++++++ rcacpid ++++++
--- /var/tmp/diff_new_pack.TS3WFG/_old 2010-10-03 22:42:40.000000000 +0200
+++ /var/tmp/diff_new_pack.TS3WFG/_new 2010-10-03 22:42:40.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/bash
-# Copyright (c) 2002-2009 SuSE Linux AG, Nuernberg, Germany.
+# Copyright (c) 2002-2010 SUSE Linux Products GmbH, Nuernberg, Germany.
# All rights reserved.
#
# Authors: Christian Zoz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org