[lirc] patches merged upstream, so pre2 won't need all this

Jarod Wilson jwilson at fedoraproject.org
Tue Oct 26 22:38:55 UTC 2010


commit 1420485bc159925f0a726271b30dceaab46a6224
Author: Jarod Wilson <jarod at redhat.com>
Date:   Tue Oct 26 18:38:54 2010 -0400

    patches merged upstream, so pre2 won't need all this
    
    Signed-off-by: Jarod Wilson <jarod at redhat.com>

 lirc.spec |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)
---
diff --git a/lirc.spec b/lirc.spec
index 1dd8038..a58e83f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -40,11 +40,6 @@ Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}-%{pre}
 %endif
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-# https://bugzilla.redhat.com/show_bug.cgi?id=457273
-# http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch0:		lirc-0.8.6-standardized-remote-keycodes.patch
-Patch1:         lirc-0.8.4-make-remote-names-all-unique.patch
-Patch2:         lirc-0.8.6-firefly-def.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -148,9 +143,6 @@ chmod +x contrib/hal
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
-sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo \
-    remotes/adstech/lircd.conf.usbx-707
-
 sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs
 
 for f in remotes/chronos/lircd.conf.chronos \
@@ -180,11 +172,6 @@ sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure*
 
 touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 
-# Do this after, as we're touching the remote definitions earlier
-# Don't create a backup, or the original definitions will get installed
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake


More information about the scm-commits mailing list