- switched to Source

- rel 0.2 - works, but don`t know what to do with missing /proc/acpi/asus/brn

Changed files:
    eee-osd.spec -> 1.2

diff --git a/eee-osd.spec b/eee-osd.spec
index 838932f786da2f7c8c302981e687003d8e074000..d02ed0ae6b61c3467e7502228913143e13a2fd8d 100644 (file)
--- a/eee-osd.spec
+++ b/eee-osd.spec
@@ -1,14 +1,17 @@
+#
+%define        _rev    r19
 Summary:       Scriptpack for enabling OSD-display for EeePC hotkeys
 Name:          eee-osd
 Version:       2.0
-Release:       0.1
+Release:       0.2
 License:       MIT
 Group:         Base
-Source0:       http://eee-osd.googlecode.com/files/%{name}-%{version}-eeexubuntu.tar.gz
-# Source0-md5: cc0c59ad054aacac47ac8003be61c756
+Source0:       %{name}-%{version}-%{_rev}.tar.bz2
+# Source0-md5: 359a69f7893b107e774a881edc3cb869
 URL:           http://code.google.com/p/eee-osd/
 Requires:      acpid
-BuildArch:     noarch
+Requires:      gnome-system-monitor
+ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -19,9 +22,11 @@ Furthermore it offers support for the fn-fx hotkeys for brightness,
 volume control and so on.
 
 %prep
-%setup -q -n eeexubuntu-osd
+%setup -q -n %{name}-%{version}-%{_rev}
+sed -i -e 's#/usr/local/share/asus_osd#/usr/share/asus_osd#' asus_osd/asusosd.c
 
 %build
+%{__make} -C asus_osd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -30,11 +35,11 @@ install -d $RPM_BUILD_ROOT%{_bindir}
 install -d $RPM_BUILD_ROOT%{_datadir}/asus_osd
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/acpi{,/events}
 
-install autostart/ASUS-OSD.desktop $RPM_BUILD_ROOT%{_datadir}/asus_osd/
+install asus_osd/asusosd $RPM_BUILD_ROOT%{_bindir}/
+install autostart/asusosd.desktop $RPM_BUILD_ROOT%{_datadir}/asus_osd/
 install ressources/* $RPM_BUILD_ROOT%{_datadir}/asus_osd/
-install binaries/asusosd $RPM_BUILD_ROOT%{_bindir}/asusosd
 install events/* $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/
-install scripts/{asus-brn-down.sh,asus-brn-up.sh,eee-wifi-on-off.sh,queryvolume.sh} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/
+install scripts/{eee-wifi-on-off.sh,queryvolume.sh} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/
 
 %clean
 rm -rf $RPM_BUILD_ROOT