From 9c785bdc5daf16e321100e35da7c11dba06cf1800a6bd747fcec2d4b94a8a594 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Mon, 22 Nov 2010 14:23:26 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/acpid
 revision 34.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/acpid?expand=0&rev=c2044fe8a67c00c65ece4ffb541616c0
---
 acpid.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acpid.spec b/acpid.spec
index d29800e..0a83568 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -21,7 +21,7 @@
 Name:           acpid
 Url:            http://tedfelix.com/linux/acpid-netlink.html
 Version:        2.0.6
-Release:        3
+Release:        4
 License:        GPLv2+
 Group:          System/Daemons
 AutoReqProv:    on

From 5ed20605a4cdc0dad012eb9930f6d44ec959ad7999948ae92c2e9419cdbdf3f4 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 22 Dec 2010 10:22:47 +0000
Subject: [PATCH 2/2] Accepting request 56596 from
 home:a_jaeger:branches:openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/56596
OBS-URL: https://build.opensuse.org/package/show/Base:System/acpid?expand=0&rev=17
---
 acpid-2.0.5-forking.patch             | 12 ------------
 acpid-2.0.6-event-skip-messages.patch | 15 ---------------
 acpid-2.0.6.tar.gz                    |  3 ---
 acpid-2.0.7.tar.gz                    |  3 +++
 acpid.changes                         | 12 ++++++++++++
 acpid.spec                            |  6 +-----
 6 files changed, 16 insertions(+), 35 deletions(-)
 delete mode 100644 acpid-2.0.5-forking.patch
 delete mode 100644 acpid-2.0.6-event-skip-messages.patch
 delete mode 100644 acpid-2.0.6.tar.gz
 create mode 100644 acpid-2.0.7.tar.gz

diff --git a/acpid-2.0.5-forking.patch b/acpid-2.0.5-forking.patch
deleted file mode 100644
index afe8cdf..0000000
--- a/acpid-2.0.5-forking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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();
diff --git a/acpid-2.0.6-event-skip-messages.patch b/acpid-2.0.6-event-skip-messages.patch
deleted file mode 100644
index 29072de..0000000
--- a/acpid-2.0.6-event-skip-messages.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- event.c.orig
-+++ event.c
-@@ -124,8 +124,11 @@ acpid_read_conf(const char *confdir)
- 
- 		/* skip any files that don't match the run-parts convention */
- 		if (regexec(&preg, dirent->d_name, 0, NULL, 0) != 0) {
--			acpid_log(LOG_INFO, "skipping conf file %s/%s\n", 
-+			if(strcmp(dirent->d_name, ".") != 0 &&
-+			   strcmp(dirent->d_name, "..") != 0) {
-+				acpid_log(LOG_INFO, "skipping conf file %s/%s\n", 
- 				confdir, dirent->d_name);
-+			}
- 			continue;
- 		}
- 
diff --git a/acpid-2.0.6.tar.gz b/acpid-2.0.6.tar.gz
deleted file mode 100644
index 766fc04..0000000
--- a/acpid-2.0.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89db450ab9c740f24fb8324f75efebf38096afa0f4c5cabc4072441659059a33
-size 74689
diff --git a/acpid-2.0.7.tar.gz b/acpid-2.0.7.tar.gz
new file mode 100644
index 0000000..00521f6
--- /dev/null
+++ b/acpid-2.0.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4c5e674176cd32d8d2547c7d0d13ad8c84045c96f5c430da2a82d099f98e09d
+size 73467
diff --git a/acpid.changes b/acpid.changes
index 4abbcbe..f395c93 100644
--- a/acpid.changes
+++ b/acpid.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Dec 22 03:36:31 UTC 2010 - aj@suse.de
+
+- Update to 2.0.7:
+  * Reduced the startup logging and skipped processing of "." and ".."
+    in the config files directory
+  * Added CD-related buttons.
+  * Removed the "getppid() == 1" hack from daemonize().  
+  * Added FD_CLOEXEC to the input layer fd's.
+  Obsoletes patches acpid-2.0.5-forking.patch and 
+  acpid-2.0.6-event-skip-messages.patch.
+
 -------------------------------------------------------------------
 Fri Nov 19 16:34:01 UTC 2010 - seife@opensuse.org
 
diff --git a/acpid.spec b/acpid.spec
index 0a83568..b0e1d28 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -20,7 +20,7 @@
 
 Name:           acpid
 Url:            http://tedfelix.com/linux/acpid-netlink.html
-Version:        2.0.6
+Version:        2.0.7
 Release:        4
 License:        GPLv2+
 Group:          System/Daemons
@@ -37,8 +37,6 @@ Source6:        thinkpad_handler
 Source7:        power_button
 Source8:        acpid.service
 Patch1:         acpid-makefile.patch
-Patch2:         acpid-2.0.5-forking.patch
-Patch3:         acpid-2.0.6-event-skip-messages.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 x86_64 ia64
 
@@ -62,8 +60,6 @@ Authors:
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p1
-%patch3
 cp %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:9} .
 
 %build