From 9108bef90d08ebd2196b32190b74122320561f57 Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Sat, 4 Sep 2010 15:41:15 -0400 Subject: [PATCH 1/3] Update to lirc 0.8.7-pre3 snapshot Signed-off-by: Jarod Wilson --- .gitignore | 1 + lirc.spec | 9 ++++++--- sources | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5af7df2..c84099b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ lirc-*.tar.bz2 *.rpm lirc-*/ lirc-0.8.7pre2.tar.bz2 +/lirc-0.8.7-pre3.tar.bz2 diff --git a/lirc.spec b/lirc.spec index d2e4a4a..83ef35f 100644 --- a/lirc.spec +++ b/lirc.spec @@ -18,7 +18,7 @@ %bcond_without ftdi %global released 0 -%define pre pre2 +%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,7 @@ of remote control configuration files. %prep -%setup -q -n %{name}-%{version}%{?pre} +%setup -q -n %{name}-%{version}-%{?pre} %patch0 -p1 %patch1 -p1 @@ -304,6 +304,9 @@ fi %changelog +* Sat Sep 04 2010 Jarod Wilson 0.8.7-0.1.pre3 +- Update to lirc 0.8.7-pre3 snapshot + * Mon Aug 02 2010 Jarod Wilson 0.8.7-0.1.pre2 - Fix up sub-package license file inclusion per new fedora licensing guidelines diff --git a/sources b/sources index df4a541..548c25c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -4ca24da6f5e7c2dcea74878c27a4a3f7 lirc-0.8.6.tar.bz2 -2da1dad0b3de588f316a5e11562fdd8d lirc-0.8.7pre2.tar.bz2 +49c6df887326aee40b6c7ff69c380af1 lirc-0.8.7-pre3.tar.bz2 From 7aaddef92a3c0960237eca68b0149ad3a7b296b7 Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Sat, 4 Sep 2010 16:04:49 -0400 Subject: [PATCH 2/3] parallel make is busted atm Signed-off-by: Jarod Wilson --- lirc.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lirc.spec b/lirc.spec index 83ef35f..3166a72 100644 --- a/lirc.spec +++ b/lirc.spec @@ -196,7 +196,9 @@ chmod +x daemons/input_map.sh %endif --with-syslog=LOG_DAEMON \ --with-driver=userspace -make %{?_smp_mflags} +# make %{?_smp_mflags} +# parallel makes are currently busted, do single-threaded for now +make %install rm -rf $RPM_BUILD_ROOT __docs From c67594ee29398244559fa816aba97312c7b23c15 Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Mon, 6 Sep 2010 13:59:06 -0400 Subject: [PATCH 3/3] lirc 0.8.7 release Signed-off-by: Jarod Wilson --- .gitignore | 1 + lirc.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c84099b..2338501 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ lirc-*.tar.bz2 lirc-*/ lirc-0.8.7pre2.tar.bz2 /lirc-0.8.7-pre3.tar.bz2 +/lirc-0.8.7.tar.bz2 diff --git a/lirc.spec b/lirc.spec index 83ef35f..2abfe59 100644 --- a/lirc.spec +++ b/lirc.spec @@ -17,7 +17,7 @@ %bcond_without irman %bcond_without ftdi -%global released 0 +%global released 1 %define pre pre3 Name: lirc @@ -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 @@ -304,6 +308,9 @@ fi %changelog +* Mon Sep 06 2010 Jarod Wilson 0.8.7-1 +- Update to lirc 0.8.7 release + * Sat Sep 04 2010 Jarod Wilson 0.8.7-0.1.pre3 - Update to lirc 0.8.7-pre3 snapshot diff --git a/sources b/sources index 548c25c..88059bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49c6df887326aee40b6c7ff69c380af1 lirc-0.8.7-pre3.tar.bz2 +fb1dcddbc8ca3d03c7f3a2d40cf28b71 lirc-0.8.7.tar.bz2