rpms/irda-utils/devel irda-utils-0.9.17-makefile.patch, NONE, 1.1 irda-utils-0.9.17-rootonly.patch, NONE, 1.1 irda-utils-0.9.17-smcdisable.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 irda-utils.spec, 1.23, 1.24 sources, 1.6, 1.7 irda-utils-0.9.16-glib2.patch, 1.1, NONE irda-utils-0.9.16-rootonly.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Jun 19 14:12:18 UTC 2006


Author: karsten

Update of /cvs/dist/rpms/irda-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9585

Modified Files:
	.cvsignore irda-utils.spec sources 
Added Files:
	irda-utils-0.9.17-makefile.patch 
	irda-utils-0.9.17-rootonly.patch 
	irda-utils-0.9.17-smcdisable.patch 
Removed Files:
	irda-utils-0.9.16-glib2.patch irda-utils-0.9.16-rootonly.patch 
Log Message:
- update to 0.9.17
- makefile fixes
- disable smcinit
- use manpages from 0.9.17-pre3 as those from 0.9.17 are corrupted


irda-utils-0.9.17-makefile.patch:
 Makefile          |    5 +++--
 irdadump/Makefile |    9 +++++----
 irnetd/Makefile   |    2 +-
 psion/Makefile    |    4 ++--
 smcinit/smcinit.c |    2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE irda-utils-0.9.17-makefile.patch ---
--- irda-utils-0.9.17/irdadump/Makefile.rh3	2006-03-09 07:25:23.000000000 +0100
+++ irda-utils-0.9.17/irdadump/Makefile	2006-06-01 14:47:25.000000000 +0200
@@ -8,8 +8,8 @@
 
 RM_CMD = $(ECMD)$(RM) *.BAK *.bak *.o ,* *~ *.a
 
-INCLUDES  = $(SYS_INCLUDES) -I../include/
-LIBRARIES = $(SYS_LIBRARIES)
+INCLUDES  = $(SYS_INCLUDES) -I../include/ -I. `pkg-config --cflags glib-2.0`
+LIBRARIES = $(SYS_LIBRARIES) `pkg-config --cflags --libs glib-2.0`
 LIBPATH   = $(SYS_LIBPATH)
 
 #
@@ -27,7 +27,7 @@
 LIBIRDADUMP_TARGET = lib_irdadump.a
 IRDADUMP_TARGET = irdadump
 
-all: lib_irdadump.a irdadump
+all:  irdadump  lib_irdadump.a
 
 
 lib_irdadump.a: $(LIBIRDADUMP_OBJS)
@@ -40,7 +40,8 @@
 
 irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
 	$(prn_cc_o)
-	$(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+	$(ECMD)$(CC) $(CFLAGS) $(LIBRARIES) -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+	#$(ECMD)$(CC) $(CFLAGS) `pkg-config --cflags --libs glib-2.0` -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
 
 
 .c.o:
--- irda-utils-0.9.17/irnetd/Makefile.rh3	2006-03-09 07:25:19.000000000 +0100
+++ irda-utils-0.9.17/irnetd/Makefile	2006-06-01 14:47:25.000000000 +0200
@@ -55,7 +55,7 @@
 
 install: irnetd
 	$(prn_install)
-	$(ECMD) install irnetd /usr/sbin/
+	$(ECMD) install irnetd $(ROOT)/usr/sbin/
 
 
 clean:
--- irda-utils-0.9.17/Makefile.rh3	2006-03-09 07:25:27.000000000 +0100
+++ irda-utils-0.9.17/Makefile	2006-06-01 14:48:21.000000000 +0200
@@ -28,10 +28,11 @@
 TARGET = test
 
 DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump smcinit
-CFLAGS= -O2 -W -Wall
+CFLAGS = -O2 -W -Wall
+INCLUDES = -I/usr/include/glib-2.0 -I./include -I.
 
 all:
-	@-(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done)
+	@-(set -e ; for d in $(DIRS) ; do $(MAKE) $(INCLUDES) $(MAKE_OUTPUT) -C $$d $@ ; done)
 
 
 install:
--- irda-utils-0.9.17/psion/Makefile.rh3	2006-03-09 07:25:19.000000000 +0100
+++ irda-utils-0.9.17/psion/Makefile	2006-06-01 14:47:25.000000000 +0200
@@ -5,6 +5,7 @@
 PSION_SRC= irpsion5.c
 PSION_OBJS= irpsion5.o
 PSION_TARGETS= irpsion5
+CFLAGS= -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
 
 all: $(PSION_TARGETS)
 
@@ -22,7 +23,6 @@
 	$(ECMD)install $(PSION_TARGETS) $(ROOT)/usr/bin
 
 
-CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
 irpsion5: 
 	$(prn_cc_o)
-	$(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
\ Kein Zeilenumbruch am Dateiende.
+	$(ECMD)$(CC) $(CFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@
--- irda-utils-0.9.17/smcinit/smcinit.c.rh3	2006-03-09 07:25:24.000000000 +0100
+++ irda-utils-0.9.17/smcinit/smcinit.c	2006-06-01 14:47:25.000000000 +0200
@@ -262,7 +262,7 @@
 	 */
 	struct pci_access *acc;
 	struct pci_dev *dev;
-	word twobyte;
+	u16 twobyte;
 	int i = 0, chip = 0;
 	int local_sir_io, local_fir_io, local_fir_irq, local_fir_dma;
 	unsigned int *address, SMC_BASE = 0;

irda-utils-0.9.17-rootonly.patch:
 main.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE irda-utils-0.9.17-rootonly.patch ---
--- irda-utils-0.9.17/irdadump/main.c.root	2006-06-01 12:53:34.000000000 +0200
+++ irda-utils-0.9.17/irdadump/main.c	2006-06-01 12:54:03.000000000 +0200
@@ -72,6 +72,11 @@
 	char *readfilename = NULL;
 	int fd, c;
 
+    if(geteuid()) {
+        puts("You need to be root to run this utility.\n");
+        return 1;
+    }
+
 	while ((c = getopt(argc, argv, "bc:di:lpr:s:tvw:x?")) != -1) {
 		switch (c) {
 		case 'b': /* Dumb bytes */

irda-utils-0.9.17-smcdisable.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE irda-utils-0.9.17-smcdisable.patch ---
--- irda-utils-0.9.17/Makefile.smcdisable	2006-06-01 14:49:01.000000000 +0200
+++ irda-utils-0.9.17/Makefile	2006-06-01 14:48:52.000000000 +0200
@@ -27,7 +27,7 @@
 
 TARGET = test
 
-DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump smcinit
+DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump
 CFLAGS = -O2 -W -Wall
 INCLUDES = -I/usr/include/glib-2.0 -I./include -I.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Sep 2004 06:25:58 -0000	1.6
+++ .cvsignore	19 Jun 2006 14:12:16 -0000	1.7
@@ -1 +1,2 @@
 irda-utils-0.9.16.tar.gz
+irda-utils-0.9.17-manpages.tgz


Index: irda-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- irda-utils.spec	3 Apr 2006 09:14:19 -0000	1.23
+++ irda-utils.spec	19 Jun 2006 14:12:16 -0000	1.24
@@ -1,23 +1,29 @@
 Summary: Utilities for infrared communication between devices.
 Name: irda-utils
-Version: 0.9.16
-Release: 8
-Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz
+Version: 0.9.17
+Release: 1
+# Download-URL: 
+#  http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download
+Source: irda-utils-%{version}.tar.gz
+# Temporary, until upstream releases a tarball with fixed manpages. These 
+# have been extracted from irda-utils-0.9.17-pre3
+Source1: irda-utils-%{version}-manpages.tgz
 Patch1: irda-utils-0.9.14-chkconfig.patch
 Patch2: irda-utils-0.9.14-typo.patch
 Patch3: irda-utils-0.9.13-i18n.patch
-Patch4: irda-utils-0.9.16-rootonly.patch
+Patch4: irda-utils-0.9.17-rootonly.patch
 Patch5: irda-utils-0.9.15-rh1.patch
 Patch6: irda-utils-0.9.16-rh2.patch
-Patch7: irda-utils-0.9.16-glib2.patch
-Patch8: irda-utils-0.9.16-io.patch
+Patch7: irda-utils-0.9.16-io.patch
+Patch8: irda-utils-0.9.17-makefile.patch
+Patch9: irda-utils-0.9.17-smcdisable.patch
 Url: http://irda.sourceforge.net/
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-root
 Prereq: /sbin/chkconfig, grep, modutils >= 2.3.21-4
 ExcludeArch: s390 s390x
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel, libtool, automake, docbook-utils
 
 %description
 IrDA(TM) (Infrared Data Association) is an industry standard for
@@ -38,14 +44,17 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .chkconfig
-%patch2 -p1 -b .typo
-%patch3 -p1 -b .i18n
-%patch4 -p1 -b .root
-%patch5 -p1 -b .rh1
-%patch6 -p1 -b .rh2
-%patch7 -p1 -b .glib2
-%patch8 -p1 -b .io
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1 -b .rh3
+%patch9 -p1
+echo $PWD
+tar xvf %{SOURCE1}
 
 %build
 make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" CFLAGS="$RPM_OPT_FLAGS"
@@ -65,7 +74,7 @@
 mv etc/modules.conf.irda etc/modprobe.conf.irda
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add irda
@@ -89,6 +98,12 @@
 %doc tekram/README.tekram
 
 %changelog
+* Mon Jun 19 2006 Karsten Hopp <karsten at redhat.de> 0.9.17-1
+- update to 0.9.17
+- makefile fixes
+- disable smcinit
+- use manpages from 0.9.17-pre3 as those from 0.9.17 are corrupted
+
 * Mon Apr 03 2006 Karsten Hopp <karsten at redhat.de> 0.9.16-8
 - don't use asm/io.h directly (Bastien Nocera #186875)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Sep 2004 06:25:58 -0000	1.6
+++ sources	19 Jun 2006 14:12:16 -0000	1.7
@@ -1 +1,2 @@
-2ff18f0571b5a331be7cd22fc3decd41  irda-utils-0.9.16.tar.gz
+65f9be306d2367996e27264ef0b70bd4  irda-utils-0.9.17.tar.gz
+77686ddf12ee1ec1b4f1a48586d6a9d3  irda-utils-0.9.17-manpages.tgz


--- irda-utils-0.9.16-glib2.patch DELETED ---


--- irda-utils-0.9.16-rootonly.patch DELETED ---




More information about the fedora-cvs-commits mailing list