diff --git a/.cvsignore b/.cvsignore index 7108e00..8c8b21d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ ibod-1.4-src.tar.gz -isdn4k-utils-07022001.tar.bz2 -kernel-header-2.4.5.tar.bz2 +isdn4k-utils-0202131200.tar.bz2 diff --git a/isdn.init b/isdn.init index 51772db..0f4bdfc 100755 --- a/isdn.init +++ b/isdn.init @@ -50,13 +50,7 @@ function isapnp() 14) VENDOR_ID="TAG2610" # Teles 16.3c PnP DEVICE_ID="TAG2610" ;; - 7) VENDOR_ID="ELS0133" # Elsa Quickstep 1000 PnP - DEVICE_ID="ELS0133" - ;; - 28) VENDOR_ID="SAG0002" # Sedlbauer Speed Fax+ PnP - DEVICE_ID="SAG0002" - ;; - *) return + *) return ;; esac fi diff --git a/isdn4k-utils-0202131200-true.patch b/isdn4k-utils-0202131200-true.patch new file mode 100644 index 0000000..33ef17c --- /dev/null +++ b/isdn4k-utils-0202131200-true.patch @@ -0,0 +1,13 @@ +--- isdn4k-utils/imon/imon.c.orig Fri Feb 22 17:24:54 2002 ++++ isdn4k-utils/imon/imon.c Fri Feb 22 17:28:00 2002 +@@ -63,6 +63,10 @@ + + #include + ++#ifndef TRUE ++#define TRUE 1 ++#endif ++ + #define KEY_Q 81 + #define KEY_q 113 + diff --git a/isdn4k-utils.spec b/isdn4k-utils.spec index 72a7c37..cb5584d 100644 --- a/isdn4k-utils.spec +++ b/isdn4k-utils.spec @@ -1,24 +1,32 @@ %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.1 -Release: 47 +Release: 52 License: GPL Group: Applications/System -Source0: ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/isdn4k-utils-07022001.tar.bz2 +Source0: ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/isdn4k-utils-0202131200.tar.bz2 Source1: http://www.compound.se/download/ibod-1.4-src.tar.gz Source2: isdn.init -Source3: kernel-header-2.4.5.tar.bz2 -Patch0: isdn4k-utils-redhat.patch -Patch1: isdn4k-utils-broken.patch +Patch0: isdn4k-utils-20020213-redhat.patch Patch2: ibod-config.patch -Patch3: isdn4k-utils-kernel.patch -Patch4: isdn4k-utils-man.patch +Patch3: isdn4k-utils-man.patch +Patch4: isdn4k-utils-0202131200-mem.patch +Patch5: isdn4k-utils-0202131200-true.patch +# workaround for building in 8.0 tree +Patch10: isdn4k-utils-buildroot.patch +Patch11: isdn4k-utils-libtool.patch +# workaround for gcc 3.1 on alpha +Patch20: isdn4k-utils-alpha.patch BuildRoot: %{_tmppath}/%name-root Requires: initscripts >= 5.92 -BuildPrereq: /usr/bin/sgml2txt, /usr/bin/sgml2html, XFree86-devel, ncurses-devel -BuildPrereq: tcl +#BuildPrereq: linuxdoc-tools +BuildPrereq: /usr/bin/sgml2txt, /usr/bin/sgml2html +BuildPrereq: XFree86-devel, ncurses-devel, tcl, kernel-source Prereq: /sbin/chkconfig, /sbin/ldconfig, /bin/ln, sh-utils Obsoletes: isdn-config, internet-config ExcludeArch: s390 s390x @@ -27,6 +35,16 @@ ExcludeArch: s390 s390x The isdn4k-utils package contains a collection of utilities needed for configuring an ISDN subsystem. +%package devel +Summary: Static library and header files for capi development. +Group: Development/Libraries +Requires: %{name} = %{version} +ExcludeArch: s390 s390x + +%description devel +The isdn4k-utils-devel package contains the capi static library and header files +required to develop capi applications. + %package vboxgetty Summary: ISDN voice box (getty). Group: Applications/Communications @@ -49,19 +67,22 @@ The xisdnload utility displays a periodically updated histogram of the load average over your ISDN connection. %prep -%setup -q -n isdn4k-utils -a 3 +%setup -q -n isdn4k-utils %patch0 -p1 -b .redhat -%patch1 -p1 -b .broken mkdir -p ibod && cd ibod && tar zxf %{SOURCE1} %patch2 -p1 -b .ibod cd .. -%patch3 -p1 -b .kernel -%patch4 -p1 -b .man +%patch3 -p1 -b .man +%patch4 -p1 -b .mem +%patch5 -p1 -b .true +%patch10 -p1 -b .buildroot +%patch11 -p1 -b .libtool +%patch20 -p1 -b .alpha %build export PATH=$PATH:/usr/X11R6/bin -mv .config.rpm .config +cp .config.rpm .config %ifnarch sparc echo CONFIG_GENMAN=y >>.config @@ -71,6 +92,14 @@ echo "CONFIG_FAQDIR='/usr/share/doc/isdn4k-utils'" >>.config ( cd %{_builddir}/isdn4k-utils/linux && ln -s /usr/include . ) +# workaround for automake/autoconf +if [ -x /usr/share/automake/depcomp ] ; then + for i in capiinfo capiinit rcapid capifax; do + cp -f /usr/share/automake/depcomp $i + ( cd $i ; aclocal && autoconf ) + done +fi + # we need it on ia64 machine ( cd capi20; [ -f configure.in ] && libtoolize --copy --force ) ( cd vbox; aclocal && autoconf ) @@ -118,6 +147,7 @@ chmod 0755 $RPM_BUILD_ROOT%{_bindir}/vboxbeep \ $RPM_BUILD_ROOT%{_sbindir}/isdnctrl # copy config files for isdnlog +mkdir -p $RPM_BUILD_ROOT%{_libdir}/isdn cp -f isdnlog/*.dat $RPM_BUILD_ROOT%{_libdir}/isdn/ chmod 644 $RPM_BUILD_ROOT%{_libdir}/isdn/*.dat @@ -282,18 +312,23 @@ rm -rf $RPM_BUILD_ROOT %verify(not md5 size mtime) %config(noreplace) /etc/ppp/ioptions %config(noreplace) /etc/ppp/peers/* %config %{initdir}/isdn -/etc/ppp/plugins/* +%{_libdir}/pppd %{_bindir}/* -%{_includedir}/* %{_libdir}/isdn -%{_libdir}/*.a %{_libdir}/*.so.* %{_mandir}/*/* /sbin/* +%if %{act} %{_sbindir}/actctrl +%endif +%if %{eicon} +%{_sbindir}/eiconctrl +%endif %{_sbindir}/avmcapictrl %{_sbindir}/capiinit +%if %{divert} %{_sbindir}/divertctrl +%endif %{_sbindir}/hisaxctrl %{_sbindir}/ibod %{_sbindir}/icnctrl @@ -320,6 +355,13 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/vboxgetty %{_sbindir}/vboxputty +%files devel +%defattr(-,root,root) +%{_includedir}/* +%{_libdir}/*.a +%{_libdir}/*.so +%{_libdir}/*.la + %files -n xisdnload %defattr(-,root,root) %{_prefix}/X11R6/bin/xisdnload @@ -330,11 +372,34 @@ rm -rf $RPM_BUILD_ROOT %doc xmonisdn/README %changelog -* Thu Apr 25 2002 Than Ngo 3.1-47 +* Fri Feb 22 2002 Than Ngo 3.1-52 +- fix bug in isdnlog (bug #60013) +- fix bug in imon + +* Wed Feb 21 2002 Than Ngo 3.1-51 +- fix bad memory allocation (enrico.scholz@informatik.tu-chemnitz.de), bug #60179 + +* Tue Feb 19 2002 Bernhard Rosenkraenzer 3.1-50 +- new upstream, needed to switch isdnlog to EUR currency for contries that + have it +- fix installation of pppcapiplugin man page +- don't build against 2.4.5 kernel headers, they're not compatible with + 2.4.17. + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Dec 05 2001 Than Ngo 3.1-48 +- new upstream +- remove some unused patch files +- move pppcapiplugin to /usr/lib/pppd, The plugin option now looks in here +- devel sub package +- buildreqquires: linuxdoc-tools + +* Mon Oct 29 2001 Than Ngo 3.1-47 - fixed symlinks bugs (bug #55306) - fix a bug in converting of old isdn configuration (bug #55083) -- fix dependency problem (bug #58242) -- add fix for ASUS COM ISDNLink ISA PnP +- some hacks for ASUS COM ISDNLink ISA PnP * Tue Aug 28 2001 Than Ngo 3.1-46 - some hacks for Teles 16.3 PnP diff --git a/sources b/sources index f04650f..5a77ce9 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ 38b45be27c0a82b38380f680fdee0aff ibod-1.4-src.tar.gz -f290082850546324b1dbf18d2709f3db isdn4k-utils-07022001.tar.bz2 -95992f26e524fcdf71b391f89fa9dc09 kernel-header-2.4.5.tar.bz2 +547a6069dabb8794a3f58640e11b5bbf isdn4k-utils-0202131200.tar.bz2