[olpc-kbdshim/f14: 9/10] v22, move from hal to udev

Peter Robinson pbrobinson at fedoraproject.org
Sat Nov 19 22:40:27 UTC 2011


commit 4067bd7c15c50ead523e77d7b17ec1f8bb5fd1f2
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Nov 19 22:36:32 2011 +0000

    v22, move from hal to udev

 olpc-kbdshim.service |   11 -----------
 olpc-kbdshim.spec    |   28 ----------------------------
 2 files changed, 0 insertions(+), 39 deletions(-)
---
diff --git a/olpc-kbdshim.spec b/olpc-kbdshim.spec
index 4b5e4c8..b946b0e 100644
--- a/olpc-kbdshim.spec
+++ b/olpc-kbdshim.spec
@@ -8,14 +8,12 @@ URL: http://dev.laptop.org/git/users/pgf/olpc-kbdshim/tree/README
 # Source0: the source tarball is created by "make tarball" from within
 # a clone of this git tree: git://dev.laptop.org/users/pgf/olpc-kbdshim
 Source0: olpc-kbdshim-22-git87ed15b.tar.gz
-Source1: olpc-kbdshim.service
 
 BuildRequires: kernel-headers, pkgconfig, glib2-devel
 BuildRequires: dbus-glib-devel, libudev-devel
 ExclusiveArch: %{ix86} %{arm}
 
 Requires: udev
-Requires: systemd-units
 
 %description
 The olpc-kbdshim-udev daemon monitors the keyboard and touchpad,
@@ -33,36 +31,11 @@ make
 
 %install
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
 
 %{__install} -p -m 755 olpc-kbdshim-udev $RPM_BUILD_ROOT/%{_bindir}/olpc-kbdshim-udev
 %{__install} -p -m 755 olpc-rotate $RPM_BUILD_ROOT/%{_bindir}/olpc-rotate
 %{__install} -p -m 755 olpc-brightness $RPM_BUILD_ROOT/%{_bindir}/olpc-brightness
 %{__install} -p -m 755 olpc-volume $RPM_BUILD_ROOT/%{_bindir}/olpc-volume
-%{__install} -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system/olpc-kbdshim.service
-
-
-%post
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl enable olpc-kbdshim.service >/dev/null 2>&1 || :
-fi
-
-
-%preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable olpc-kbdshim.service > /dev/null 2>&1 || :
-    /bin/systemctl stop olpc-kbdshim.service > /dev/null 2>&1 || :
-fi
-
-
-%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart olpc-kbdshim.service >/dev/null 2>&1 || :
-fi
 
 
 %files
@@ -73,7 +46,6 @@ fi
 %{_bindir}/olpc-rotate
 %{_bindir}/olpc-brightness
 %{_bindir}/olpc-volume
-/lib/systemd/system/*
 
 
 %changelog


More information about the scm-commits mailing list