rpms/irda-utils/devel irda-utils-0.9.18-root.patch, NONE, 1.1 irda-utils.spec, 1.36, 1.37

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/irda-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15618

Modified Files:
	irda-utils.spec 
Added Files:
	irda-utils-0.9.18-root.patch 
Log Message:
* Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 0.9.18-10
- Add patch to fix installing of initscript into buildroot


irda-utils-0.9.18-root.patch:
 install-etc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE irda-utils-0.9.18-root.patch ---
--- irda-utils-0.9.18/etc/install-etc.root	2006-07-11 00:16:06.000000000 -0600
+++ irda-utils-0.9.18/etc/install-etc	2009-10-20 10:11:39.691877856 -0600
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # Only install on SYSV for now
-if [ -d /etc/sysconfig/ ]; then
+if [ -d $ROOT/etc/sysconfig/ ]; then
     install -D irda.sysconfig $ROOT/etc/sysconfig/irda
     install -D ifcfg-irlan0 $ROOT/etc/sysconfig/network-scripts/ifcfg-irlan0
 fi
-if [ -d /etc/rc.d/init.d ]; then
+if [ -d $ROOT/etc/rc.d/init.d ]; then
     install -D irda.rc $ROOT/etc/rc.d/init.d/irda
 fi


Index: irda-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- irda-utils.spec	10 Aug 2009 08:47:58 -0000	1.36
+++ irda-utils.spec	20 Oct 2009 16:28:47 -0000	1.37
@@ -1,7 +1,7 @@
 Summary:         Utilities for infrared communication between devices
 Name:            irda-utils
 Version:         0.9.18
-Release:         9%{?dist}
+Release:         10%{?dist}
 Url:             http://irda.sourceforge.net/
 License:         GPLv2+
 Group:           Applications/System
@@ -22,6 +22,7 @@ Patch7: irda-utils-0.9.16-io.patch
 Patch8: irda-utils-0.9.17-makefile.patch
 Patch9: irda-utils-0.9.17-smcdisable.patch
 Patch10: irda-utils-0.9.17-initscript.patch
+Patch11: irda-utils-0.9.18-root.patch
 
 %description
 IrDA(TM) (Infrared Data Association) is an industry standard for
@@ -52,6 +53,7 @@ actually implemented outside the kernel.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \
@@ -60,7 +62,7 @@ make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT/%{_initddir}
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
 
 make install  ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}"
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda
@@ -96,6 +98,9 @@ fi
 %doc tekram/README.tekram
 
 %changelog
+* Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 0.9.18-10
+- Add patch to fix installing of initscript into buildroot
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.9.18-9
 - Convert specfile to UTF-8.