From 1cfd150d69bc007a236203a9de3eae5ee9af47b9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:10:29 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for irda-utils --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 8d971ae96170b4fa378173db2a8093f6f4d0c925 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 20 Oct 2009 16:27:03 +0000 Subject: [PATCH 2/4] - Add patch to fix installing of initscript into buildroot --- irda-utils-0.9.18-root.patch | 15 +++++++++++++++ irda-utils.spec | 9 +++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 irda-utils-0.9.18-root.patch diff --git a/irda-utils-0.9.18-root.patch b/irda-utils-0.9.18-root.patch new file mode 100644 index 0000000..770cae2 --- /dev/null +++ b/irda-utils-0.9.18-root.patch @@ -0,0 +1,15 @@ +--- 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 diff --git a/irda-utils.spec b/irda-utils.spec index a2dfbe3..2ee9e5d 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -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" ROOT="$RPM_BUILD_ROOT" \ %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 - 0.9.18-10 +- Add patch to fix installing of initscript into buildroot + * Mon Aug 10 2009 Ville Skyttä - 0.9.18-9 - Convert specfile to UTF-8. From 89c2209cac85b9c308644898110590e05f428cc4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:22:50 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fb6f61a..7e4ccf5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: irda-utils -# $Id: Makefile,v 1.1 2004/09/09 06:22:17 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:53:34 notting Exp $ NAME := irda-utils SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From dcb1603bcd23ad976b97966162f4f8454e458230 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:27:34 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7e4ccf5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: irda-utils -# $Id: Makefile,v 1.2 2007/10/15 18:53:34 notting Exp $ -NAME := irda-utils -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12