rpms/isdn4k-utils/F-12 isdn4k-utils-CVS-2009-10-20-lib64.patch, NONE, 1.1 isdn4k-utils-CVS-2009-10-20-redhat.patch, NONE, 1.1 isdn4k-utils.spec, 1.81, 1.82 sources, 1.15, 1.16 isdn4k-utils-CVS-2004-11-18-lib64.patch, 1.2, NONE isdn4k-utils-CVS-2006-02-13-cleanup.patch, 1.1, NONE isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch, 1.1, NONE isdn4k-utils-CVS-2006-07-20-redhat.patch, 1.2, NONE isdn4k-utils-CVS-2008-01-07-redhat.patch, 1.1, NONE isdn4k-utils-gcc3x.patch, 1.1, NONE
Than Ngo
than at fedoraproject.org
Tue Oct 20 12:25:48 UTC 2009
Author: than
Update of /cvs/extras/rpms/isdn4k-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28176
Modified Files:
isdn4k-utils.spec sources
Added Files:
isdn4k-utils-CVS-2009-10-20-lib64.patch
isdn4k-utils-CVS-2009-10-20-redhat.patch
Removed Files:
isdn4k-utils-CVS-2004-11-18-lib64.patch
isdn4k-utils-CVS-2006-02-13-cleanup.patch
isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
isdn4k-utils-CVS-2006-07-20-redhat.patch
isdn4k-utils-CVS-2008-01-07-redhat.patch
isdn4k-utils-gcc3x.patch
Log Message:
- add missing man pages
- add upstream fixes
isdn4k-utils-CVS-2009-10-20-lib64.patch:
Makefile.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE isdn4k-utils-CVS-2009-10-20-lib64.patch ---
diff -up isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template
--- isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me 2009-10-20 14:08:23.000000000 +0200
+++ isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template 2009-10-20 14:09:17.000000000 +0200
@@ -8,7 +8,7 @@
# as published by the Free Software Foundation; either version
# 2 of the License, or (at your option) any later version.
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}/$(LIBDIR)/pppd/$(PPPVERSION)
include $(TOPDIR)/Rules.make
isdn4k-utils-CVS-2009-10-20-redhat.patch:
isdn4k-utils-CVS-2003-09-23/.config.rpm | 49 +++++-----
isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in | 10 +-
isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in | 2
isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in | 6 -
isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am | 2
isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am | 2
isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am | 2
isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/doc/Makefile.in | 2
isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in | 10 +-
isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/icn/Makefile.in | 10 +-
isdn4k-utils-CVS-2003-09-23/imon/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/imontty/Makefile | 6 -
isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c | 2
isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in | 12 +-
isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf | 35 ++-----
isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in | 4
isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in | 6 -
isdn4k-utils-CVS-2003-09-23/lib/Makefile.in | 2
isdn4k-utils-CVS-2003-09-23/loop/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in | 8 -
isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am | 2
isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example | 6 -
isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example | 20 ++--
isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile | 2
isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in | 10 +-
isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile | 2
isdn4k-utils-CVS-2005-02-16/lib/Makefile | 2
isdn4k-utils-CVS-2009-10-20/Makefile | 12 --
34 files changed, 141 insertions(+), 149 deletions(-)
--- NEW FILE isdn4k-utils-CVS-2009-10-20-redhat.patch ---
--- isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in.redhat 2002-07-19 21:03:49.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/act2000
DEFS =
LDFLAGS = -L../lib @LIBS@
PROGRAM = actctrl
@@ -18,9 +18,9 @@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_DATA = $(INSTALL) -m 0644
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
CC = @CC@
--- isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in.redhat 1999-06-19 11:39:59.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -12,7 +12,7 @@
# only ones that _really_ exist on _every_ system.
#
BUILDOPTS := $(DATAOPTS)
- INSTALLOPTS := $(DATAOPTS) INSTALL="install -o 0 -g 0 -m 644"
+ INSTALLOPTS := $(DATAOPTS) INSTALL="install -m 644"
endif
all: .depend
--- isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in.redhat 2002-07-19 21:03:50.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
+CFLAGS = $(RPM_OPT_FLAGS)
LDFLAGS = -L../lib @LIBS@
INCLUDES = -I.
PROGRAMS = avmcapictrl
@@ -15,8 +15,8 @@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
CC = @CC@
--- isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am.redhat 2000-03-03 16:54:12.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am 2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
stamp-h.in
INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
LDADD = -lcapi20
--- isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am.redhat 2000-10-20 19:14:20.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am 2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
stamp-h.in comperr
INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
LDADD = -lcapi20
--- isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am.redhat 2000-03-17 17:19:43.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am 2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
stamp-h.in comperr core
INCLUDES = $(all_includes)
-CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g
+CFLAGS = -Wall -D_GNU_SOURCE $(RPM_OPT_FLAGS)
LDFLAGS = $(all_libraries)
LDADD =
--- isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in.redhat 2002-07-19 21:03:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,16 +5,16 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/divert
DEFS =
LDFLAGS = -L../lib @LIBS@
PROGRAM = divertctrl
MODULES = divertctrl.o
MANPAGE = divertctrl.8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils-CVS-2003-09-23/doc/Makefile.in.redhat 1999-12-24 15:14:50.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/doc/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -9,7 +9,7 @@
SED = @SED@
MANDIR = @CONFIG_MANDIR@
MANPAGES = ttyI.4 isdninfo.4 isdn_audio.4 isdnctrl.4 isdn_cause.7
-INSTALL_MAN = @INSTALL@ -o 0 -g 0 -m 0644
+INSTALL_MAN = @INSTALL@ -m 0644
prefix = @prefix@
%.1: %.man
--- isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in.redhat 2002-07-19 20:42:01.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -7,8 +7,8 @@
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2 -DUNIX -DLINUX
-INCLUDES = -I. -Iinclude
+CFLAGS = -Wall -DUNIX -DLINUX $(RPM_OPT_FLAGS)
+INCLUDES = -I. -Iinclude -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/eicon
LDFLAGS = -L../lib @LIBS@
PROGRAMS =
PROGRAM = eiconctrl
@@ -22,9 +22,9 @@
DATA_DIR = @CONFIG_DATADIR@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_DATA = $(INSTALL) -m 0644
+INSTALL_MAN = $(INSTALL) -m 0644
CC = @CC@
COPTS = -DDATADIR=\"$(shell echo $(DESTDIR)$(DATA_DIR))\"
--- isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in.redhat 2002-07-19 21:03:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -6,7 +6,7 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2 -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS) -I. -I at CONFIG_KERNELDIR@/include
LDFLAGS = -L../lib @LIBS@
PROGRAMS =
MODULES = hisaxctrl.o
@@ -16,9 +16,9 @@
DATADIR = @CONFIG_DATADIR@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_DATA = $(INSTALL) -m 0644
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
ifeq ("@CONFIG_HISAXCTRL@","y")
--- isdn4k-utils-CVS-2003-09-23/icn/Makefile.in.redhat 2002-07-19 21:03:52.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/icn/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/icn
DEFS =
LDFLAGS = -L../lib @LIBS@
PROGRAM = icnctrl
@@ -17,9 +17,9 @@
DATADIR = @CONFIG_DATADIR@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_DATA = $(INSTALL) -m 0644
+INSTALL_MAN = $(INSTALL) -m 0644
CC = @CC@
COPTS =
--- isdn4k-utils-CVS-2003-09-23/imon/Makefile.in.redhat 2002-07-19 21:03:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/imon/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -7,8 +7,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include
LDFLAGS = -L../lib @LIBS@
PROGRAM = imon
MODULES = imon.o
@@ -18,8 +18,8 @@
SBINDIR = @CONFIG_SBINDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
CC = @CC@
--- isdn4k-utils-CVS-2003-09-23/imontty/Makefile.redhat 2002-07-19 23:23:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/imontty/Makefile 2003-09-30 17:44:24.000000000 +0200
@@ -15,14 +15,14 @@
# Manual config standalone
#
CONFIG_SBINDRIR := /sbin
- MAN8DIR := /usr/man/man8
+ MAN8DIR := /usr/share/man/man8
endif
INSTALL=install
-INSTALL_MAN=$(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_MAN=$(INSTALL) -m 0644
MANPAGE=imontty.8
-CCFLAGS=-O2
+CCFLAGS=$(RPM_OPT_FLAGS) -I$(CONFIG_KERNELDIR)/include
#CCFLAGS=-I$(ISDN_INCLUDE) -g
# nothing to change behind this line
--- isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in.redhat 2002-07-19 21:03:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -6,14 +6,14 @@
MANDIR = @CONFIG_MANDIR@
CC = @CC@
INSTALL = @INSTALL@
-INSTALL_SBIN = $(INSTALL) -m 755 -o 0 -g 0
-INSTALL_DATA = $(INSTALL) -m 644 -o 0 -g 0
-INSTALL_DIR = $(INSTALL) -m 755 -o 0 -g 0 -d
+INSTALL_SBIN = $(INSTALL) -m 755
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_DIR = $(INSTALL) -m 755 -d
PPPSTATSRCS = ipppstats.c
PPPSTATOBJS = ipppstats.o
-CFLAGS = -fomit-frame-pointer -O2
+CFLAGS = $(RPM_OPT_FLAGS) -I at CONFIG_KERNELDIR@/include
all: ipppstats
--- isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in.redhat 2002-07-19 23:23:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include
LDFLAGS = -L../lib @LIBS@
PROGRAM = iprofd
MODULES = iprofd.o
@@ -15,8 +15,8 @@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
CC = @CC@
--- isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in.redhat 2002-07-19 23:23:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include
LDFLAGS = @LIBS@
PROGRAM = isdnctrl
MODULES = isdnctrl.o
@@ -15,8 +15,8 @@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
CC = @CC@ -DVERSION=\"@I4LVERSION@\"
prefix = @prefix@
exec_prefix = @exec_prefix@
--- isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf.redhat 2000-09-08 10:55:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf 2003-09-30 17:44:24.000000000 +0200
@@ -2,38 +2,31 @@
#
# More information: See the isdnlog documentation
+#INTERFACE = ippp0 # Isdn network interface. This information is required
+ # with the "-hx" / hangup="value" option.
+
+
[MSN]
NUMBER = 4711
ALIAS = Phone
SI = 1
ZONE = 1
-START = {
- [FLAG]
- FLAGS = I|O|R|C|B|A|E|H
- PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
-}
+#START = {
+# [FLAG]
+# FLAGS = I|O|R|C|B|A|E|H
+# PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
+#}
[MSN]
NUMBER = 4711
ALIAS = HDLC
SI = 7
ZONE = 1
-START = {
- [FLAG]
- FLAGS = I|O|R|C|B|A|E|
- PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
-}
-
-[MSN]
-NUMBER = 4712
-ALIAS = Modem
-SI = 1
-ZONE = 1
-START = {
- [FLAG]
- FLAGS = I|O|R|C|B|A|E|H
- PROGRAM = /bin/myprog \$1 \$2 \$3 Modem
-}
+#START = {
+# [FLAG]
+# FLAGS = I|O|R|C|B|A|E|
+# PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
+#}
[NUMBER]
NUMBER = 01910
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in.redhat 2000-08-15 17:16:23.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -20,7 +20,7 @@
BINDIR:=$(DESTDIR)@prefix@/bin
INCDIR:=$(DESTDIR)@prefix@/include
-CFLAGS:=-Wall -O2
+CFLAGS:=-Wall $(RPM_OPT_FLAGS)
all: depend $(FILES)
@@ -46,7 +46,7 @@
install -d -m0755 $(MAN1DIR) $(MAN3DIR) $(LIBDIR) $(BINDIR) \
$(INCDIR)
-install:
+install: install-dirs
install -m0755 $(BINS) $(BINDIR)
install -m0644 $(MAN1) $(MAN1DIR)
install -m0644 $(MAN3) $(MAN3DIR)
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in.redhat 2003-07-25 23:23:15.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -6,7 +6,7 @@
-include ../../../.config
BZIP2 = @BZIP2@
SHELL = /bin/sh
-CFLAGS = -Wall -g
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
INCLUDES =
LDFLAGS = @DBMLIB@
export DBEXT = @DBEXT@
@@ -20,9 +20,9 @@
SBINDIR = @CONFIG_SBINDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
+INSTALL_DATA = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
DATADIR = @datadir@
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in.redhat 2003-03-11 14:08:00.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
#
BZIP2 = @BZIP2@
SHELL = /bin/sh
-CFLAGS = -Wall -g
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
INCLUDES =
LDFLAGS = @DBMLIB@
CDBEXTRALIBS = @CDBEXTRALIBS@
@@ -20,8 +20,8 @@
SBINDIR = @CONFIG_SBINDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
#CC = @CC@ -V2.7.2.3
--- isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in.redhat 2003-08-26 21:46:11.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -1542,10 +1542,10 @@
# autoconf isdnlog specific stuff
#
INSTALL := @INSTALL@
-INSTALL_DIR := $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN := $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN := $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA := $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR := $(INSTALL) -m 0755 -d
+INSTALL_SBIN := $(INSTALL) -m 0700
+INSTALL_BIN := $(INSTALL) -m 0755
+INSTALL_DATA := $(INSTALL) -m 0644
BZIP2 := @BZIP2@
BUNZIP2 := $(BZIP2) -f -d
@@ -1600,9 +1600,9 @@
SUBDIRS += $(LIBISDNDIR)
endif
-# export CFLAGS = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
+# export CFLAGS = -Wall -pipe -frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
-export CFLAGS = -Wall -pipe
+export CFLAGS = -Wall $(RPM_OPT_FLAGS)
ifndef _CC
export _CC = gcc
endif
--- isdn4k-utils-CVS-2003-09-23/lib/Makefile.in.redhat 1999-12-12 18:22:36.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/lib/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -11,7 +11,7 @@
# Install as root with numeric Id's, since these are the
# only ones that _really_ exist on _every_ system.
#
- INSTALLOPTS += INSTALL= install -o 0 -g 0 -m 644
+ INSTALLOPTS += INSTALL= install -m 644
endif
all: .depend
--- isdn4k-utils-CVS-2003-09-23/loop/Makefile.in.redhat 2002-07-19 21:03:56.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/loop/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,16 +5,16 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -O2
-INCLUDES = -I.
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
+INCLUDES = -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/loopctrl
DEFS =
LDFLAGS = -L../lib @LIBS@
PROGRAM = loopctrl
MODULES = loopctrl.o
MANPAGE = loopctrl.8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in.redhat 2002-07-19 21:03:57.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in 2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
#
#
SHELL = /bin/sh
-CFLAGS = -Wall -Wstrict-prototypes -O2 -g
-INCLUDES = -I. -DDEBUG
+CFLAGS = -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
+INCLUDES = -I. -DDEBUG -I at CONFIG_KERNELDIR@/drivers/isdn/pcbit
LDFLAGS = -L../lib @LIBS@
PROGRAM = pcbitctl
MODULES = pcbitctl.o convhexbin.o
@@ -15,8 +15,8 @@
MANDIR = @CONFIG_MANDIR@
MAN8DIR = $(MANDIR)/man8
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM = $(INSTALL) -m 0750
+INSTALL_MAN = $(INSTALL) -m 0644
prefix = @prefix@
exec_prefix = @exec_prefix@
CC = @CC@
--- isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am.redhat 2002-07-19 23:23:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am 2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
stamp-h.in comperr
INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
LDADD = -lcapi20
--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example.redhat 1997-04-28 18:51:29.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example 2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
# login (server startup) time. If access is 'yes' the host can login
# and count messages without special access.
-L:localhost:Y
+#L:localhost:Y
L:*:N
# Full access list
@@ -13,7 +13,7 @@
# All hosts in the full access list (begins with 'A') are checked if the
# server gets the 'login' command.
-A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
-A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
+#A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
+#A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
A:*:!:!:!:!:!
--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example.redhat 1997-10-22 22:46:58.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example 2003-09-30 17:44:24.000000000 +0200
@@ -20,18 +20,18 @@
# Settings for port ttyI6
-port /dev/ttyI6
- modeminit ATZ&B512&E7830022
- user nicole
- group users
- spooldir /var/spool/vbox/nicole
+#port /dev/ttyI6
+# modeminit ATZ&B512&E7830022
+# user nicole
+# group users
+# spooldir /var/spool/vbox/nicole
# Settings for port ttyI7
-port /dev/ttyI7
- modeminit ATZ&B512&E7850413
- user michael
- group users
- spooldir /var/spool/vbox/michael
+#port /dev/ttyI7
+# modeminit ATZ&B512&E7850413
+# user michael
+# group users
+# spooldir /var/spool/vbox/michael
--- isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile.redhat 1998-03-08 19:54:01.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile 2003-09-30 17:44:24.000000000 +0200
@@ -21,7 +21,7 @@
OBJS = xisdnload.o
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion
- DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
+ DEFINES = -D_GNU_SOURCE -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
AllTarget(xisdnload)
NormalProgramTarget(xisdnload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
--- isdn4k-utils-CVS-2003-09-23/.config.rpm.redhat 1998-11-23 13:12:04.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/.config.rpm 2003-09-30 17:59:55.000000000 +0200
@@ -5,16 +5,16 @@
#
# Code maturity level options
#
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
#
# General configuration
#
CONFIG_BUILDX11=y
-CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_KERNELDIR='/usr/src/linux-2.4'
CONFIG_BINDIR='/usr/bin'
-CONFIG_SBINDIR='/sbin'
-CONFIG_MANDIR='/usr/man'
+CONFIG_SBINDIR='/usr/sbin'
+CONFIG_MANDIR='/usr/share/man'
CONFIG_RUNDIR='/var/run'
CONFIG_LOCKDIR='/var/lock'
CONFIG_LOCKFILE='LCK..'
@@ -23,11 +23,9 @@
CONFIG_CALLERIDFILE='callerid.conf'
CONFIG_USERCONFFILE='~/.isdn'
CONFIG_COUNTRYCODE='49'
-CONFIG_AREACODE=''
+CONFIG_AREACODE='9999'
CONFIG_COUNTRY_PREFIX='+'
CONFIG_AREA_PREFIX='0'
-CONFIG_DATADIR='/usr/lib/isdn'
-CONFIG_LIB_AREACODE=y
#
# Runtime configuration tools
@@ -36,18 +34,20 @@
CONFIG_ISDNCTRL_CONF=y
CONFIG_ISDNCTRL_TIMRU=y
CONFIG_IPROFD=y
+#CONFIG_DIVERTCTRL=y
#
# Card configuration tools
#
-# CONFIG_TELESCTRL is not set
+CONFIG_TELESCTRL=y
CONFIG_HISAXCTRL=y
CONFIG_ICNCTRL=y
# CONFIG_ICNCTRL_DEBUG is not set
CONFIG_PCBITCTL=y
CONFIG_AVMCAPICTRL=y
+#CONFIG_EICONCTRL=y
CONFIG_LOOPCTRL=y
-CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop'
+CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux-2.4/drivers/isdn/isdnloop'
# CONFIG_LOOPCTRL_DEBUG is not set
#
@@ -64,14 +64,20 @@
CONFIG_ISDNLOG_USERFILE='isdnlog.users'
CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
-CONFIG_ISDNLOG_RELOADCMD='reload'
-CONFIG_ISDNLOG_STOPCMD='stop'
+CONFIG_ISDNLOG_RELOADCMD='/etc/rc.d/init.d/isdn restart'
+CONFIG_ISDNLOG_STOPCMD='/etc/rc.d/init.d/isdn stop'
CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
# CONFIG_ISDNLOG_POSTGRES is not set
# CONFIG_ISDNLOG_MYSQLDB is not set
+# CONFIG_ISDNLOG_ORACLE is not set
CONFIG_ISDN_LOG_DE=y
+CONFIG_ISDN_LOG_CC_DE=y
+CONFIG_ISDN_LOG_DEST_DE=y
+# CONFIG_ISDN_LOG_DEST_AT is not set
+# CONFIG_ISDN_LOG_DEST_NL is not set
+# CONFIG_ISDN_LOG_DEST_CH is not set
CONFIG_IPPPSTATS=y
CONFIG_XISDNLOAD=y
CONFIG_XMONISDN=y
@@ -79,8 +85,8 @@
#
# Options for xmonisdn
#
-CONFIG_XMONISDN_UPCMD='/sbin/netup'
-CONFIG_XMONISDN_DOWNCMD='/sbin/netdown'
+CONFIG_XMONISDN_UPCMD='/sbin/ifup'
+CONFIG_XMONISDN_DOWNCMD='/sbin/ifdown'
#
# Applications
@@ -94,23 +100,22 @@
VBOX_LOGDIR='/var/log/vbox'
VBOX_PIDDIR='/var/run'
VBOX_LOCKDIR='/var/lock'
-VBOX_DOCDIR='/usr/doc/vbox'
-VBOX_TCL='tcl8.0'
+VBOX_DOCDIR='/usr/share/doc/vbox'
+VBOX_TCL='tcl8.5'
+# VBOX_SUSPEND_ID is not set
CONFIG_IPPPD=y
#
# Options for ipppd
#
-CONFIG_IPPPD_MSCHAP=y
+# CONFIG_IPPPD_MSCHAP is not set
+CONFIG_IPPP_FILTER=y
# CONFIG_IPPPD_RADIUS is not set
# CONFIG_RADIUS_WTMP_LOGGING is not set
RADIUS_CLIENT_CONFIG_FILE=''
CONFIG_CAPIFAX=y
CONFIG_RCAPID=y
-#
-# Documentation
-#
-CONFIG_GENMAN=y
-CONFIG_FAQ=y
-CONFIG_FAQDIR='/usr/doc/faq/isdn4linux'
+# CAPI plugins
+CONFIG_PPPDCAPIPLUGIN=y
+
--- isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c.redhat 2000-11-12 17:06:42.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c 2004-01-20 19:14:07.000000000 +0100
@@ -41,7 +41,7 @@
#include "compressions.h"
-#if 0
+#if HAVE_LZSCOMP_H
#include <linux/isdn_lzscomp.h>
#else
#include "../ipppcomp/isdn_lzscomp.h"
--- isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in.redhat 2004-08-30 16:56:36.000000000 +0200
+++ isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in 2005-02-16 18:42:54.119955183 +0100
@@ -15,10 +15,10 @@
MANDIR := @CONFIG_MANDIR@
CC := @CC@
INSTALL := @INSTALL@
-INSTALL_DIR := $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN := $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN := $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA := $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR := $(INSTALL) -m 0755 -d
+INSTALL_SBIN := $(INSTALL) -m 0700
+INSTALL_BIN := $(INSTALL) -m 0755
+INSTALL_DATA := $(INSTALL) -m 0644
RADIUS_CLIENT_CONFIG_FILE := @RADIUS_CLIENT_CONFIG_FILE@
ifeq (@CONFIG_IPPPD_MSCHAP@,y)
@@ -73,7 +73,7 @@
DEBUG_FLAGS = @CONFIG_IPPPD_DEBUGFLAGS@
COMPILE_FLAGS = @CFLAGS@
-CFLAGS = -O2 -fomit-frame-pointer -Wall
+CFLAGS = $(RPM_OPT_FLAGS)
VER = 2.2.0
# it's a hack
--- isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile.cflags 2005-02-16 18:53:15.393382578 +0100
+++ isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile 2005-02-16 18:53:51.914999474 +0100
@@ -1,4 +1,4 @@
-CC=gcc -m486 -O2 -Wall -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
+CC=gcc $(RPM_OPT_FLAGS) -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
#CC=gcc -m486 -O2 -g -pg -Wall -DSTANDALONE -I. -I.. -I../isdnlog
all: rate-at
--- isdn4k-utils-CVS-2005-02-16/lib/Makefile.cflags 2005-02-16 19:04:04.338731270 +0100
+++ isdn4k-utils-CVS-2005-02-16/lib/Makefile 2005-02-16 19:04:24.150811068 +0100
@@ -28,7 +28,7 @@
# USER CONFIGURATION AREA
######################################################################
-CFLAGS = -g -Wall -pipe #-O6
+CFLAGS = $(RPM_OPT_FLAGS)
DEFS =
ifndef _CC
export _CC = gcc
diff -up isdn4k-utils-CVS-2009-10-20/Makefile.me isdn4k-utils-CVS-2009-10-20/Makefile
--- isdn4k-utils-CVS-2009-10-20/Makefile.me 2009-10-20 12:28:37.000000000 +0200
+++ isdn4k-utils-CVS-2009-10-20/Makefile 2009-10-20 12:29:14.000000000 +0200
@@ -18,8 +18,8 @@ LIBDIR:=/usr/lib
# Following line is important for lib and isdnlog (sl).
export ROOTDIR=$(shell pwd)
-ifeq (.config,$(wildcard .config))
-include .config
+ifeq (.config.h,$(wildcard .config.h))
+include .config.h
do-it-all: subtargets
else
CONFIGURATION = config
@@ -134,14 +134,8 @@ rootperm:
install:
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
- @: || if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
- then \
- /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
- else \
- sh scripts/makedev.sh $(DESTDIR) ; \
- fi
-uninstall: rootperm
+uninstall:
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
#
Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/F-12/isdn4k-utils.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- isdn4k-utils.spec 25 Jul 2009 03:38:33 -0000 1.81
+++ isdn4k-utils.spec 20 Oct 2009 12:25:48 -0000 1.82
@@ -2,7 +2,7 @@
%define app_defaults_dir %{_datadir}/X11/app-defaults
-%define interver CVS-2006-07-20
+%define interver CVS-2009-10-20
%ifarch s390 s390x
%define PIE -fPIE
%else
@@ -10,14 +10,11 @@
%endif
%define initdir /etc/rc.d/init.d
-%define divert 0
-%define eicon 0
-%define act 0
Summary: Utilities for configuring an ISDN subsystem.
Name: isdn4k-utils
Version: 3.2
-Release: 65%{?dist}
+Release: 66%{?dist}
License: GPLv2+
Group: Applications/System
@@ -28,21 +25,18 @@ Source3: userisdnctl.c
Source4: isdndial
Source5: isdnstatus
Source6: isdnhangup
-Source7: isdn4k-utils-ppp-2.4.4.tar.bz2
Source8: capi.init
+Source9: capiinit.8
-Patch0: isdn4k-utils-CVS-2008-01-07-redhat.patch
+Patch0: isdn4k-utils-CVS-2009-10-20-redhat.patch
+Patch1: isdn4k-utils-CVS-2009-10-20-lib64.patch
Patch2: ibod-config.patch
Patch3: isdn4k-utils-man.patch
Patch4: isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
Patch5: isdn4k-utils-0202131200-true.patch
-Patch7: isdn4k-utils-CVS-2006-02-13-cleanup.patch
-Patch10: isdn4k-utils-CVS-2004-11-18-lib64.patch
Patch11: isdn4k-utils-statfs.patch
Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch
Patch13: isdn4k-utils-capiinit.patch
-Patch14: isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
-Patch15: isdn4k-utils-gcc3x.patch
Patch16: isdn4k-utils-CVS-2006-07-20-capi.patch
Patch17: isdn4k-utils-misc-overflow-in-capi-subsystem.patch
Patch18: isdn4k-utils-sh-linux.patch
@@ -72,6 +66,7 @@ BuildRequires: libXext-devel
BuildRequires: imake
BuildRequires: automake
BuildRequires: libtool
+BuildRequires: ppp-devel
Prereq: /sbin/chkconfig
Prereq: /sbin/ldconfig
@@ -112,8 +107,9 @@ The xisdnload utility displays a periodi
load average over your ISDN connection.
%prep
-%setup -q -n %{name}-%{interver} -a 7
+%setup -q -n %{name}-%{interver}
%patch0 -p1 -b .redhat
+%patch1 -p1 -b .lib64
mkdir -p ibod
pushd ibod
@@ -124,13 +120,9 @@ popd
%patch3 -p1 -b .man
%patch4 -p1 -b .ac25x
%patch5 -p1 -b .true
-%patch7 -p0 -b .cleanup
-%patch10 -p1 -b .lib64
%patch11 -p1 -b .statfs
%patch12 -p1 -b .xmon
%patch13 -p1 -b .capi
-%patch14 -p1 -b .pppd-2.4.4
-%patch15 -p1 -b .glibc
%patch16 -p1 -b .capi
%patch17 -p1 -b .misc-overflow
%patch18 -p1 -b .sh-support
@@ -186,7 +178,9 @@ mkdir -p %{buildroot}/dev \
%{buildroot}/etc/{rc.d/init.d,ppp,isdn} \
%{buildroot}/var/{log/vbox,spool/vbox,lock/isdn} \
%{buildroot}%{_prefix}/{sbin,bin} \
- %{buildroot}%{_mandir}/man4
+ %{buildroot}%{_mandir}/man1 \
+ %{buildroot}%{_mandir}/man4 \
+ %{buildroot}%{_mandir}/man8
chmod 1777 %{buildroot}/var/spool/vbox
make install DESTDIR=%{buildroot} \
@@ -265,23 +259,12 @@ rm -rf %{buildroot}%{_docdir}/isdn4k-uti
# move doc file to avoid conflict
cp isdnlog/README isdnlog/README.isdnlog
-%if !%{divert}
- rm -rf %{buildroot}%{_mandir}/man8/divertctrl.8*
- rm -f %{buildroot}/sbin/divertctrl
-%endif
-
-%if !%{eicon}
- rm -rf %{buildroot}%{_mandir}/man8/eiconctrl.8*
- rm -rf %{buildroot}%{_libdir}/eicon
- rm -f %{buildroot}/sbin/eiconctrl
-%endif
+install -m644 %{SOURCE9} %{buildroot}%{_mandir}/man8/
chmod 644 %{buildroot}%{_mandir}/man?/*
chmod 755 %{buildroot}%{_bindir}/vboxbeep
-rm -f %{buildroot}%{_sbindir}/{divalog,divalogd,divertctrl}
-
mkdir -p $RPM_BUILD_ROOT/etc
install -m 644 capiinit/capi.conf $RPM_BUILD_ROOT/etc
@@ -419,12 +402,14 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root)
%dir /etc/isdn
+%dir /etc/vbox
%dir /var/spool/vbox
%dir /var/log/vbox
%verify(not md5 size mtime) %config(noreplace) /etc/isdn/*
%verify(not md5 size mtime) %config(noreplace) /etc/ppp/ioptions
%config(noreplace) /etc/ppp/peers/*
%config(noreplace) /etc/capi.conf
+%config(noreplace) /etc/vbox/*.conf
%config %{initdir}/isdn
%config %{initdir}/capi
%{_libdir}/pppd
@@ -444,16 +429,7 @@ rm -rf %{buildroot}
%exclude %{_bindir}/xisdnload
%exclude %{_bindir}/xmonisdn
/sbin/*
-%if %{act}
-%{_sbindir}/actctrl
-%endif
-%if %{eicon}
-%{_sbindir}/eiconctrl
-%endif
%{_sbindir}/capiinit
-%if %{divert}
-%{_sbindir}/divertctrl
-%endif
%{_sbindir}/ibod
%{_sbindir}/imon
%{_sbindir}/imontty
@@ -506,6 +482,10 @@ rm -rf %{buildroot}
%doc xmonisdn/README
%changelog
+* Mon Oct 19 2009 Than Ngo <than at redhat.com> - 3.2-66
+- add missing man pages
+- add upstream fixes
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-65
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources 19 Jul 2006 14:54:56 -0000 1.15
+++ sources 20 Oct 2009 12:25:48 -0000 1.16
@@ -1,3 +1,3 @@
38b45be27c0a82b38380f680fdee0aff ibod-1.4-src.tar.gz
-92c52638be0abee7bd8195878f4df335 isdn4k-utils-ppp-2.4.4.tar.bz2
-7cde4a61e870bb7e53cd912a3fc30207 isdn4k-utils-CVS-2006-07-20.tar.bz2
+0f85c8843d99230945a23fee3cb7983d isdn4k-utils-CVS-2009-10-20.tar.bz2
+45e047c31ebbdfd2865532a80393223b capiinit.8
--- isdn4k-utils-CVS-2004-11-18-lib64.patch DELETED ---
--- isdn4k-utils-CVS-2006-02-13-cleanup.patch DELETED ---
--- isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch DELETED ---
--- isdn4k-utils-CVS-2006-07-20-redhat.patch DELETED ---
--- isdn4k-utils-CVS-2008-01-07-redhat.patch DELETED ---
--- isdn4k-utils-gcc3x.patch DELETED ---
More information about the fedora-extras-commits
mailing list