- renamed capi packages to match those from capi4k-utils.spec (but keeping -libs...

- merged rcapid patch, capi.conf file and capi init script from old capi4k-utils

diff --git a/capi.conf b/capi.conf
new file mode 100644 (file)
index 0000000..2fbc43c
--- /dev/null
+++ b/capi.conf
@@ -0,0 +1,27 @@
+# card         file            proto   io      irq     mem     cardnr  options
+b1isa          b1.t4           DSS1    0x150   7       -       -       P2P
+b1pci          b1.t4           DSS1    -       -       -       -
+b1pci          -               -       -       -       -       -
+b1pci          -               -       -       -       -       -       P2P
+b1pciv4                b1.t4           -       -       -       -       -
+c2             c2.bin          DSS1    -       -       -       -
+c2             -               DSS1    -       -       -       -
+c4             c4.bin          DSS1    -       -       -       -
+c4             -               DSS1    -       -       -       -
+c4             -               DSS1    -       -       -       -       P2P
+c4             c4.bin          DSS1    -       -       -       -       P2P
+t1isa          t1.t4           DSS1    0x340   9       -       0
+t1pci          t1.t4           DSS1    -       -       -       -
+fcclassic      -               -       0x300   5       -       -
+fcpci          -               -       -       -       -       -
+fcpcmcia       -               -       -       -       -       -
+fcpnp          -               -       0x150   10      -       -
+fcdsl          fdslbase.bin    -       -       -       -       -
+fcdsl2         fds2base.bin    -       -       -       -       -
+fcusb          -               -       -       -       -       -
+fcusb20                fus2base.frm    -       -       -       -       -
+fcusb21                fus3base.frm    -       -       -       -       -
+fxusb          -               -       -       -       -       -
+fcdslusb       fdsubase.frm    -       -       -       -       -
+fcdslsl                fdssbase.bin    -       -       -       -       -
+fcdslslusb     fdlubase.frm    -       -       -       -       -

diff --git a/capi.init b/capi.init
new file mode 100644 (file)
index 0000000..1ab46cd
--- /dev/null
+++ b/capi.init
@@ -0,0 +1,44 @@
+#! /bin/sh
+#
+# capi          Start/Stop the CAPI 2.0 drivers.
+#
+# chkconfig:   2345 09 91
+# description: CAPI is a UNIX program that starts the CAPI 2.0 interface \
+#              for CAPI compatible devices, like AVM PCI and USB devices, \
+#              certain Eicon DIVA cards, certain Siemens Gigaset devices, \
+#              certain Hagenuk external modems, etc..
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+
+# See how we were called.
+case "$1" in
+  start)
+       msg_starting "CAPI 2.0 drivers"
+       daemon capiinit start
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/capi
+       ;;
+  stop)
+       msg_stopping "CAPI 2.0 drivers"
+       daemon capiinit stop
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/capi
+       ;;
+  status)
+       daemon capiinit show
+       RETVAL=$?
+       ;;
+  restart)
+       $0 stop
+       $0 start
+       RETVAL=$?
+       ;;
+  *)
+       msg_usage "$0 {start|stop|restart|status}"
+       exit 3
+esac
+
+exit $RETVAL

diff --git a/isdn4k-utils-rcapid.patch b/isdn4k-utils-rcapid.patch
new file mode 100644 (file)
index 0000000..3bb7ad4
--- /dev/null
+++ b/isdn4k-utils-rcapid.patch
@@ -0,0 +1,28 @@
+--- capi4k-utils.orig/rcapid/rcapid.c  2000-01-29 19:52:25.000000000 +0100
++++ capi4k-utils/rcapid/rcapid.c       2010-07-21 13:08:15.901331523 +0200
+@@ -483,7 +483,10 @@
+       char    *p;
+ 
+       structure       retstruct;
+-      char            retval [80];
++      union {
++              char            c [80];
++              unsigned short  s;
++      } retval;
+ 
+ 
+       log(5, "RCAPI_GET_PROFILE_REQ\n");
+@@ -496,10 +499,10 @@
+       CtrlNr = get_dword(&p);
+       log(5, "\tCtrlNr: %d\n", CtrlNr);
+ 
+-      memset(retval, 0, sizeof(retval));
+-      *(unsigned short *)retval = CAPI20_GET_PROFILE(CtrlNr, retval+2); 
++      memset(&retval, 0, sizeof(retval));
++      retval.s = CAPI20_GET_PROFILE(CtrlNr, retval.c+2); 
+       retstruct.len = 66;
+-      retstruct.data = retval;
++      retstruct.data = retval.c;
+ 
+       return(snd_message(msg, RCAPI_GET_PROFILE_CONF, &retstruct, NULL));
+ }

diff --git a/isdn4k-utils.spec b/isdn4k-utils.spec
index be4553ea6f85717c2fb58797ba534ae266c5f1f2..b0bbbeaea6e0b903537c8276064a3df808595e74 100644 (file)
--- a/isdn4k-utils.spec
+++ b/isdn4k-utils.spec
@@ -12,12 +12,15 @@ Group:              Applications/Communications
 Source0:       %{name}-%{version}.tar.xz
 # Source0-md5: cb297fd819a146f4c7afc6bc9706ac51
 Source1:       %{name}.config
+Source2:       capi.conf
+Source3:       capi.init
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-pppdcapiplugin.patch
 Patch2:                %{name}-am.patch
 Patch3:                %{name}-sh.patch
 Patch4:                %{name}-opt.patch
 Patch5:                %{name}-link.patch
+Patch6:                %{name}-rcapid.patch
 URL:           http://www.isdn4linux.de/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -88,84 +91,92 @@ Developement files for isdn4k-tools.
 %description devel -l pl.UTF-8
 Pliki potrzebne do programowania z użyciem isdn4k-tools.
 
-%package -n capi
-Summary:       Program which can initialize CAPI hardware
-Summary(pl.UTF-8):     Program inicjujący sprzęt ISDN zgodny z CAPI
+%package -n capi4k-utils
+Summary:       Configuration tools for CAPI hardware
+Summary(pl.UTF-8):     Programy konfiguracyjne do sprzętu CAPI
 Group:         Applications/Communications
+Obsoletes:     capi
+Obsoletes:     capi-tools
+Obsoletes:     capi4k-utils-remotecapi
 
-%description -n capi
+%description -n capi4k-utils
 The Common ISDN Application Programming Interface - CAPI for short -
 opens up a new dimension in communication technologies. It provides a
 uniform, independent interface to ISDN hardware components.
 
-This package contains program which initialize your CAPI hardware. You
-should install appropriate kernel module first and edit
+This package contains programs which initialize your CAPI hardware.
+You should install appropriate kernel module first and edit
 /etc/capi.conf.
 
-%description -n capi -l pl.UTF-8
+%description -n capi4k-utils -l pl.UTF-8
 Standard Common ISDN Application Programming Interface - w skrócie
 CAPI - otwiera nowy wymiar w świecie technologii komunikacyjnych.
 Dostarcza ujednolicony, niezależny interfejs do sprzętu ISDN.
 
-Ten pakiet zawiera program inicjalizujący kartę ISDN zgodną z CAPI.
+Ten pakiet zawiera programy inicjalizujące karty ISDN zgodne z CAPI.
 Trzeba zaopatrzyć się w odpowiedni moduł jądra i zmodyfikować plik
 /etc/capi.conf.
 
-%package -n capi-libs
-Summary:       CAPI 2.0 - shared library
-Summary(pl.UTF-8):     Biblioteka dzielona CAPI 2.0
-Group:         Libraries
+%package -n capi4k-utils-capifax
+Summary:       CAPI 2.0 fax tool
+Summary(de.UTF-8):     CAPI 2.0 Fax Programm
+Summary(pl.UTF-8):     Proste narzędzie do faksowania z użyciem CAPI 2.0
+Group:         Applications/Communications
+Requires:      capi4k-utils = %{epoch}:%{version}-%{release}
 
-%description -n capi-libs
+%description -n capi4k-utils-capifax
 The Common ISDN Application Programming Interface (CAPI for short)
 opens up a new dimension in communication technologies. It provides a
 uniform, independent interface to ISDN hardware components.
 
-This package contains shared library which provide CAPI 2.0.
+This package contains native tools for sending and receiving fax with
+CAPI 2.0.
 
-%description -n capi-libs -l pl.UTF-8
+%description -n capi4k-utils-capifax -l pl.UTF-8
 Standard Common ISDN Application Programming Interface (w skrócie
 CAPI) otwiera nowy wymiar w świecie technologii komunikacyjnych.
 Dostarcza ujednolicony, niezależny interfejs do sprzętu ISDN.
 
-Ten pakiet zawiera bibliotekę dzieloną, która realizuje standard CAPI
-w wersji 2.0.
+Ten pakiet zawiera natywne narzędzia do wysyłania i odbierania faksów
+przy użyciu CAPI 2.0.
 
-%package -n capi-libs-static
-Summary:       Static libraries for CAPI 2.0
-Summary(pl.UTF-8):     Statyczne biblioteki dla CAPI 2.0
-Group:         Development/Libraries
-Requires:      capi-devel = %{epoch}:%{version}-%{release}
+%package -n capi4k-utils-libs
+Summary:       CAPI 2.0 - shared library
+Summary(pl.UTF-8):     Biblioteka dzielona CAPI 2.0
+Group:         Libraries
+Obsoletes:     capi-libs
+Conflicts:     capi4k-utils < 3:3.25
 
-%description -n capi-libs-static
+%description -n capi4k-utils-libs
 The Common ISDN Application Programming Interface (CAPI for short)
 opens up a new dimension in communication technologies. It provides a
 uniform, independent interface to ISDN hardware components.
 
-This package contains static library which provide CAPI 2.0.
+This package contains shared library which provides CAPI 2.0.
 
-%description -n capi-libs-static -l pl.UTF-8
+%description -n capi4k-utils-libs -l pl.UTF-8
 Standard Common ISDN Application Programming Interface (w skrócie
 CAPI) otwiera nowy wymiar w świecie technologii komunikacyjnych.
 Dostarcza ujednolicony, niezależny interfejs do sprzętu ISDN.
 
-Ten pakiet zawiera bibliotekę statyczną, która realizuje standard CAPI
+Ten pakiet zawiera bibliotekę dzieloną, która realizuje standard CAPI
 w wersji 2.0.
 
-%package -n capi-devel
-Summary:       CAPI 2.0 - development stuff
-Summary(pl.UTF-8):     CAPI 2.0 - zasoby programistyczne
+%package -n capi4k-utils-devel
+Summary:       CAPI 2.0 - development files
+Summary(pl.UTF-8):     CAPI 2.0 - pliki programistyczne
 Group:         Development/Libraries
-Requires:      capi-libs = %{epoch}:%{version}-%{release}
+Requires:      capi4k-utils-libs = %{epoch}:%{version}-%{release}
+Obsoletes:     capi-devel
 
-%description -n capi-devel
+%description -n capi4k-utils-devel
 The Common ISDN Application Programming Interface (CAPI for short)
 opens up a new dimension in communication technologies. It provides a
 uniform, independent interface to ISDN hardware components.
 
 This package contains developement files for CAPI 2.0.
 
-%description -n capi-devel -l pl.UTF-8
+%description -n capi4k-utils-devel -l pl.UTF-8
 Standard Common ISDN Application Programming Interface (w skrócie
 CAPI) otwiera nowy wymiar w świecie technologii komunikacyjnych.
 Dostarcza ujednolicony, niezależny interfejs do sprzętu ISDN.
@@ -173,26 +184,27 @@ Dostarcza ujednolicony, niezależny interfejs do sprzętu ISDN.
 Ten pakiet zawiera pliki niezbędne przy tworzeniu programów
 wykorzystujących standard CAPI 2.0.
 
-%package -n capi-tools
-Summary:       CAPI 2.0 - useful programs
-Summary(pl.UTF-8):     CAPI 2.0 - programy użytkowe
-Group:         Applications/Communications
+%package -n capi4k-utils-static
+Summary:       Static libraries for CAPI 2.0
+Summary(pl.UTF-8):     Statyczne biblioteki dla CAPI 2.0
+Group:         Development/Libraries
+Requires:      capi4k-utils-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     capi-libs-static
 
-%description -n capi-tools
+%description -n capi4k-utils-static
 The Common ISDN Application Programming Interface (CAPI for short)
 opens up a new dimension in communication technologies. It provides a
 uniform, independent interface to ISDN hardware components.
 
-This package contains programs which can make use of your CAPI
-compliant ISDN hardware.
+This package contains static library which provide CAPI 2.0.
 
-%description -n capi-tools -l pl.UTF-8
+%description -n capi4k-utils-static -l pl.UTF-8
 Standard Common ISDN Application Programming Interface (w skrócie
 CAPI) otwiera nowy wymiar w świecie technologii komunikacyjnych.
 Dostarcza ujednolicony, niezależny interfejs do sprzętu ISDN.
 
-Ten pakiet zawiera programy, które potrafią zrobić użytek ze zgodnego
-z CAPI sprzętu ISDN.
+Ten pakiet zawiera bibliotekę statyczną, która realizuje standard CAPI
+w wersji 2.0.
 
 %package -n ppp-plugin-capi
 Summary:       CAPI plugin for pppd-%{ppp_ver}
@@ -214,6 +226,7 @@ Wtyczka CAPI dla pppd w wersji %{ppp_ver}.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # don't symlink app-defaults dir to /etc/X11
 %{__sed} -i -e 's,@xmkmf,imake -I%{_libdir}/X11/config -DUseInstalled -DUseSeparateConfDir=NO,' xisdnload/Makefile.in
@@ -260,6 +273,11 @@ install -d $RPM_BUILD_ROOT{/var/lock/isdn,/sbin}
        PPPVERSION=%{ppp_ver} \
        XAPPLOADDIR=%{_appdefsdir}
 
+install -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/capi.conf
+install -D %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/capi
+# Firmware goes here - see LSB and kernel 2.6.x ISDN stuff
+install -d $RPM_BUILD_ROOT%{_datadir}/isdn
+
 test ! -d isdn-doc || %{__rm} -r isdn-doc
 install -d isdn-doc/faq
 %{__mv} $RPM_BUILD_ROOT%{_docdir}/isdn4linux/faq/*.{txt,html} isdn-doc/faq
@@ -272,8 +290,8 @@ install -d isdn-doc/faq
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -n capi-libs -p /sbin/ldconfig
-%postun        -n capi-libs -p /sbin/ldconfig
+%post  -n capi4k-utils-libs -p /sbin/ldconfig
+%postun        -n capi4k-utils-libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -384,13 +402,29 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_includedir}/X11/bitmaps/net*
 
-%files -n capi
+%files -n capi4k-utils
 %defattr(644,root,root,755)
-%doc capiinit/capi.conf
+%doc rcapid/README capiinit/capi.conf
+%attr(755,root,root) /sbin/avmcapictrl
 %attr(755,root,root) /sbin/capiinit
+%attr(755,root,root) /sbin/rcapid
+%attr(755,root,root) %{_bindir}/capiinfo
+%dir %{_datadir}/isdn
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/capi.conf
+%attr(754,root,root) /etc/rc.d/init.d/capi
+%{_mandir}/man8/avmcapictrl.8*
+%{_mandir}/man8/capiinfo.8*
 %{_mandir}/man8/capiinit.8*
+%{_mandir}/man8/rcapid.8*
 
-%files -n capi-libs
+%files -n capi4k-utils-capifax
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/capifax
+%attr(755,root,root) %{_bindir}/capifaxrcvd
+%{_mandir}/man1/capifax.1*
+%{_mandir}/man8/capifaxrcvd.8*
+
+%files -n capi4k-utils-libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcapi20.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcapi20.so.3
@@ -399,12 +433,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/capi/lib_capi_mod_rcapi.so*
 %attr(755,root,root) %{_libdir}/capi/lib_capi_mod_std.so*
 
-%files -n capi-libs-static
-%defattr(644,root,root,755)
-%{_libdir}/libcapi20.a
-%{_libdir}/libcapi20dyn.a
-
-%files -n capi-devel
+%files -n capi4k-utils-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcapi20.so
 %{_libdir}/libcapi20.la
@@ -415,19 +444,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/capiutils.h
 %{_pkgconfigdir}/capi20.pc
 
-%files -n capi-tools
+%files -n capi4k-utils-static
 %defattr(644,root,root,755)
-%doc rcapid/README
-%attr(755,root,root) /sbin/avmcapictrl
-%attr(755,root,root) /sbin/rcapid
-%attr(755,root,root) %{_bindir}/capiinfo
-%attr(755,root,root) %{_bindir}/capifax
-%attr(755,root,root) %{_bindir}/capifaxrcvd
-%{_mandir}/man1/capifax.1*
-%{_mandir}/man8/avmcapictrl.8*
-%{_mandir}/man8/capiinfo.8*
-%{_mandir}/man8/capifaxrcvd.8*
-%{_mandir}/man8/rcapid.8*
+%{_libdir}/libcapi20.a
+%{_libdir}/libcapi20dyn.a
 
 %files -n ppp-plugin-capi
 %defattr(644,root,root,755)