Merge branch 'master' of ssh://pkgs.fedoraproject.org/lirc

Conflicts:
	lirc.spec

.gitignore

@@ -3,3 +3,5 @@ lirc-*.tar.bz2
 *.rpm
 lirc-*/
 lirc-0.8.7pre2.tar.bz2
+/lirc-0.8.7-pre3.tar.bz2
+/lirc-0.8.7.tar.bz2

lirc.spec

@@ -17,8 +17,8 @@
 %bcond_without  irman
 %bcond_without  ftdi
 
-%global released 0
-%define pre     pre2
+%global released 1
+%define pre     pre3
 
 Name:           lirc
 Version:        0.8.7
@@ -35,7 +35,7 @@ URL:            http://www.lirc.org/
 %if 0%{?released}
 Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 %else
-Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}-%{pre}.tar.bz2
 %endif
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
@@ -135,7 +135,11 @@ of remote control configuration files.
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre}
+%if 0%{?released}
+%setup -q
+%else
+%setup -q -n %{name}-%{version}-%{pre}
+%endif
 %patch0 -p1
 %patch1 -p1
 
@@ -196,8 +200,8 @@ chmod +x daemons/input_map.sh
 %endif
   --with-syslog=LOG_DAEMON \
   --with-driver=userspace
-#make %{?_smp_mflags}
-# There's a parallel make race failure here somewhere that needs to be sorted.
+# make %{?_smp_mflags}
+# parallel makes are currently busted, do single-threaded for now
 make
 
 %install
@@ -306,6 +310,12 @@ fi
 
 
 %changelog
+* Mon Sep 06 2010 Jarod Wilson <jarod@redhat.com> 0.8.7-1
+- Update to lirc 0.8.7 release
+
+* Sat Sep 04 2010 Jarod Wilson <jarod@redhat.com> 0.8.7-0.1.pre3
+- Update to lirc 0.8.7-pre3 snapshot
+
 * Mon Aug 02 2010 Jarod Wilson <jarod@redhat.com> 0.8.7-0.1.pre2
 - Fix up sub-package license file inclusion per new fedora
   licensing guidelines

sources

@@ -1,2 +1 @@
-4ca24da6f5e7c2dcea74878c27a4a3f7  lirc-0.8.6.tar.bz2
-2da1dad0b3de588f316a5e11562fdd8d  lirc-0.8.7pre2.tar.bz2
+fb1dcddbc8ca3d03c7f3a2d40cf28b71  lirc-0.8.7.tar.bz2