commit 749589b17bf6a44c1afed2f8941fa1fe4f9c4124
Author: Jakub Bogusz <[email protected]>
Date: Sat Nov 14 11:35:14 2015 +0100
- new URLs, updated to 2.0.25
- removed obsolete micmute patch
- package kacpimon
acpid-micmute.patch | 14 --------------
acpid.spec | 28 ++++++++++++++--------------
2 files changed, 14 insertions(+), 28 deletions(-)
---
diff --git a/acpid.spec b/acpid.spec
index ce75e55..42cae8b 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -7,16 +7,15 @@
# also it does not allow *.conf files (missing "."), which is not backward
# compatible (custom files can be left unprocessed)
# but if patch is made to allow ".", must consider to ignore
.rpm{new,old,save} files
-# - build and package kacpimon
Summary: ACPI Event Daemon
Summary(pl.UTF-8): Demon zdarzeń ACPI
Name: acpid
-Version: 2.0.10
-Release: 17
+Version: 2.0.25
+Release: 1
License: GPL v2+
Group: Daemons
-Source0: http://tedfelix.com/linux/%{name}-%{version}.tar.gz
-# Source0-md5: d5dd88bcfaa4a0bf51905e95115da6df
+Source0:
http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz
+# Source0-md5: 69bb0cc4a0a89eb2dfecc4851087f568
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.logrotate
@@ -26,9 +25,10 @@ Source6: %{name}.button.sh
Source7: %{name}.battery.sh
Source9: %{name}.service
Source10: %{name}.preconfig
-Patch1: %{name}-micmute.patch
-URL: http://tedfelix.com/linux/acpid-netlink.html
+URL: http://sourceforge.net/projects/acpid2/
BuildRequires: rpmbuild(macros) >= 1.647
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
Requires(post,preun): /sbin/chkconfig
Requires(post,preun,postun): systemd-units >= 38
Requires: rc-scripts >= 0.4.3.0
@@ -77,13 +77,11 @@ wyłącznie jako dyspozytor wiadomości.
%prep
%setup -q
-%patch1 -p1
%build
-%{__make} \
- CC="%{__cc}" \
- LDFLAGS="%{rpmcflags} %{rpmldflags}" \
- OPT="%{rpmcppflags} %{rpmcflags} -Wno-error"
+%configure
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -105,7 +103,7 @@ install %{SOURCE9} $RPM_BUILD_ROOT%{systemdunitdir}
install %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/%{name}
> $RPM_BUILD_ROOT/var/log/acpid
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -142,8 +140,9 @@ fi
%files
%defattr(644,root,root,755)
-%doc Changelog README TODO TESTPLAN
+%doc Changelog README TESTPLAN TODO
%attr(755,root,root) %{_sbindir}/acpid
+%attr(755,root,root) %{_sbindir}/kacpimon
%attr(755,root,root) %{_bindir}/acpi_listen
%dir %{_sysconfdir}/acpi
%dir %{_sysconfdir}/acpi/events
@@ -155,6 +154,7 @@ fi
%attr(640,root,root) %ghost /var/log/acpid
%{_mandir}/man8/acpid.8*
%{_mandir}/man8/acpi_listen.8*
+%{_mandir}/man8/kacpimon.8*
%dir %{_datadir}/%{name}
%attr(755,root,root) %{_datadir}/%{name}/acpid.preconfig
diff --git a/acpid-micmute.patch b/acpid-micmute.patch
deleted file mode 100644
index 7a2e69c..0000000
--- a/acpid-micmute.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruNp acpid-2.0.10.orig/input_layer.c acpid-2.0.10/input_layer.c
---- acpid-2.0.10.orig/input_layer.c 2011-03-12 17:22:34.000000000 +0100
-+++ acpid-2.0.10/input_layer.c 2014-10-23 21:15:00.054570789 +0200
-@@ -115,6 +115,10 @@ static struct evtab_entry evtab[] = {
- "button/volumeup VOLUP 00000080 00000000"},
- {{{0,0}, EV_KEY, KEY_MUTE, 1},
- "button/mute MUTE 00000080 00000000"},
-+ {{{0,0}, EV_KEY, KEY_MICMUTE, 1},
-+ "button/micmute MICMUTE 00000080 00000000"},
-+ {{{0,0}, EV_KEY, KEY_F20, 1},
-+ "ibm/hotkey HKEY 00000080 0000101b"},
- /* cd play/pause buttons */
- {{{0,0}, EV_KEY, KEY_NEXTSONG, 1},
- "cd/next CDNEXT 00000080 00000000"},
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/acpid.git/commitdiff/749589b17bf6a44c1afed2f8941fa1fe4f9c4124
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
