SPECS: lirc.spec - killed vserver patch, lirc builds ok wih both v...

[hawk]

Author: hawk                         Date: Mon May  5 17:21:49 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- killed vserver patch, lirc builds ok wih both vserver and non-vserver kernel
- updated sparc patch, killed lirc-i2c-2.8.x.patch (both Th and Titanium have
  newer i2c and Ac uses outdated lirc)
- renumbered patches

---- Files affected:
SPECS:
   lirc.spec (1.160 -> 1.161) 

---- Diffs:

================================================================
Index: SPECS/lirc.spec
diff -u SPECS/lirc.spec:1.160 SPECS/lirc.spec:1.161
--- SPECS/lirc.spec:1.160	Mon May  5 18:46:15 2008
+++ SPECS/lirc.spec	Mon May  5 19:21:44 2008
@@ -2,13 +2,11 @@
 # TODO
 # - restore lirc_parallel driver
 # - try to make it use builder_kernel_modules and install_kernel_modules; I couldn't make it
-# - investigate Patch8: vserver; non-vserver enabled kernels don't have the find_task_by_real_pid function (like kernel-desktop)
 # - build is running kernel arch dependent, try to get rid of this
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without sources of distribution kernel
 %bcond_without	kernel		# don't build kernel modules, only library+programs
-%bcond_without	vserver		# without vserver specific patch
 %bcond_without	userspace	# build only packages with kernel modules
 %bcond_without	svga		# without svgalib-based utility
 %bcond_without	x		# without X11-based utilitied
@@ -52,13 +50,11 @@
 Source4:	%{pname}md.init
 Patch0:		%{pname}-opt.patch
 Patch1:		%{pname}-tmp.patch
-Patch3:		%{pname}-no-svgalib.patch
-Patch4:		%{pname}-alpha.patch
-Patch5:		%{pname}-i2c-2.8.x.patch
-Patch6:		%{pname}-sparc.patch
-Patch7:		%{pname}-remotes.patch
-Patch8:		%{pname}-vserver.patch
-Patch9:		%{pname}-kernelcc.patch
+Patch2:		%{pname}-no-svgalib.patch
+Patch3:		%{pname}-alpha.patch
+Patch4:		%{pname}-sparc.patch
+Patch5:		%{pname}-remotes.patch
+Patch6:		%{pname}-kernelcc.patch
 URL:		http://www.lirc.org/
 #%{?with_x:BuildRequires:	xorg-lib-libX11-devel}
 BuildRequires:	autoconf
@@ -581,20 +577,12 @@
 %patch0 -p1
 %patch1 -p1
 %if !%{with svga}
-%patch3 -p1
+%patch2 -p1
 %endif
+%patch3 -p1
 %patch4 -p1
-%if %{with kernel}
-if grep -qs 'I2C_VERSION.*"2\.8\.' %{_kernelsrcdir}/include/linux/i2c.h ; then
-%patch5 -p0
-fi
-%endif
-#%patch6 -p1
-%patch7 -p1
-#%if %{with vserver}
-#%patch8 -p1
-#%endif
-%patch9 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 echo '#' > drivers/Makefile.am
@@ -1014,6 +1002,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2008-05-05 17:21:44  hawk
+- killed vserver patch, lirc builds ok wih both vserver and non-vserver kernel
+- updated sparc patch, killed lirc-i2c-2.8.x.patch (both Th and Titanium have
+  newer i2c and Ac uses outdated lirc)
+- renumbered patches
+
 Revision 1.160  2008-05-05 16:46:15  hawk
 - started update to 0.8.3, killed long time unused bttv-headers.patch,
   killed unecessary 2.6.23 and 2.6.24 patches, commented out sparc and
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lirc.spec?r1=1.160&r2=1.161&f=u