From b42dd8d6f3c9579480937934320b394ccbf85aff2f6d9d44f8338e8bb93f09e3 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sun, 27 Sep 2015 06:39:35 +0000
Subject: [PATCH] Accepting request 333895 from
 home:pluskalm:branches:Base:System

- Update to 2.0.25
  * Remove release process from README.
  * Fix missing libc_compat.h in release tarball.
- Changes for 2.0.24
  * Avoid using SW_VIDEOOUT_INSERT if it isn't available.
  * Add support for Copy and Restart keys.
  * Add support for non-glibc libc's.
  * Fix compiler warnings.
  * Add systemd info to documentation.
- Update project url
- Cleanup spec file with spec-cleaner
- Obey default CFLAGS

OBS-URL: https://build.opensuse.org/request/show/333895
OBS-URL: https://build.opensuse.org/package/show/Base:System/acpid?expand=0&rev=76
---
 acpid-2.0.23.tar.xz  |  3 ---
 acpid-2.0.25.tar.xz  |  3 +++
 acpid-makefile.patch |  8 +++++---
 acpid.changes        | 16 ++++++++++++++++
 acpid.spec           | 16 ++++++++--------
 5 files changed, 32 insertions(+), 14 deletions(-)
 delete mode 100644 acpid-2.0.23.tar.xz
 create mode 100644 acpid-2.0.25.tar.xz

diff --git a/acpid-2.0.23.tar.xz b/acpid-2.0.23.tar.xz
deleted file mode 100644
index 628645a..0000000
--- a/acpid-2.0.23.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4396aaec13510c3a1faa941a15a4b5335b6ae4fbec8438b9249b88c3b66187ee
-size 154504
diff --git a/acpid-2.0.25.tar.xz b/acpid-2.0.25.tar.xz
new file mode 100644
index 0000000..c83e79f
--- /dev/null
+++ b/acpid-2.0.25.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b700a8072bec162c512f72cbe419195601ab3e0ffd2138f9bd95ed3097a5c68
+size 154124
diff --git a/acpid-makefile.patch b/acpid-makefile.patch
index b8924cc..f4fb21f 100644
--- a/acpid-makefile.patch
+++ b/acpid-makefile.patch
@@ -1,6 +1,8 @@
---- Makefile.in.orig	2012-03-16 09:34:42.474574907 -0400
-+++ Makefile.in	2012-03-16 09:34:59.373363642 -0400
-@@ -890,7 +890,7 @@
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig
++++ Makefile.in
+@@ -980,7 +980,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/acpid.changes b/acpid.changes
index ddcd30a..4f93eae 100644
--- a/acpid.changes
+++ b/acpid.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Sep 26 10:51:13 UTC 2015 - mpluskal@suse.com
+
+- Update to 2.0.25
+  * Remove release process from README.
+  * Fix missing libc_compat.h in release tarball.
+- Changes for 2.0.24
+  * Avoid using SW_VIDEOOUT_INSERT if it isn't available.
+  * Add support for Copy and Restart keys.
+  * Add support for non-glibc libc's.
+  * Fix compiler warnings.
+  * Add systemd info to documentation.
+- Update project url
+- Cleanup spec file with spec-cleaner
+- Obey default CFLAGS
+
 -------------------------------------------------------------------
 Tue Dec 16 12:11:57 UTC 2014 - p.drouand@gmail.com
 
diff --git a/acpid.spec b/acpid.spec
index 86eb308..3435386 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package acpid
 #
-# 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
@@ -17,12 +17,12 @@
 
 
 Name:           acpid
-Version:        2.0.23
+Version:        2.0.25
 Release:        0
 Summary:        Executes Actions at ACPI Events
 License:        GPL-2.0+
 Group:          System/Daemons
-Url:            http://tedfelix.com/linux/acpid-netlink.html
+Url:            http://sourceforge.net/projects/acpid2/
 Source:         http://downloads.sourceforge.net/project/acpid2/%{name}-%{version}.tar.xz
 Source3:        README.SUSE
 Source5:        events.power_button
@@ -32,7 +32,6 @@ Source8:        acpid.service
 Source9:        events.thinkpad
 Source10:       events.sleep_button
 Source11:       sleep_button
-
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch1:         acpid-makefile.patch
 BuildRequires:  systemd-rpm-macros
@@ -54,13 +53,14 @@ script loads all needed modules.
 cp %{SOURCE3} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE9} %{SOURCE10} %{SOURCE11} .
 
 %build
+export CFLAGS="%{optflags}"
 export LDFLAGS="-Wl,-z,relro,-z,now"
-%configure 
+%configure
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} SBINDIR=%{_sbindir}
-install -Dm 744 thinkpad_handler %{buildroot}%{_prefix}/lib/acpid/thinkpad_handler
+install -Dm 744 thinkpad_handler %{buildroot}%{_libexecdir}/acpid/thinkpad_handler
 install -Dm 644 events.thinkpad %{buildroot}%{_sysconfdir}/acpi/events/thinkpad
 mkdir -p %{buildroot}/%{_unitdir}
 install -m 644 %{SOURCE8} %{buildroot}/%{_unitdir}
@@ -91,8 +91,8 @@ touch %{buildroot}%{_localstatedir}/log/acpid
 %dir %{_sysconfdir}/acpi
 %dir %{_sysconfdir}/acpi/events
 %{_sysconfdir}/acpi/events/thinkpad
-%{_prefix}/lib/acpid
-%_unitdir/%{name}.service
+%{_libexecdir}/acpid
+%{_unitdir}/%{name}.service
 %{_sbindir}/rcacpid
 %{_sbindir}/acpid
 %{_sbindir}/kacpimon