[packages/mISDNuser] - updated to 2.0.19 (1.x left on mISDNv1 branch) - removed outdated build patch
qboosh
qboosh at pld-linux.org
Thu Aug 6 18:29:12 CEST 2015
commit 8009035127052cb1307293505892d399eb908e00
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Aug 6 18:29:16 2015 +0200
- updated to 2.0.19 (1.x left on mISDNv1 branch)
- removed outdated build patch
mISDNuser-build.patch | 125 -------------------------------------
mISDNuser.spec | 166 ++++++++++++++++++++++++++++++++++++++------------
2 files changed, 127 insertions(+), 164 deletions(-)
---
diff --git a/mISDNuser.spec b/mISDNuser.spec
index f01d986..53b867a 100644
--- a/mISDNuser.spec
+++ b/mISDNuser.spec
@@ -1,16 +1,32 @@
-%define _ver %(echo %{version} | tr . _).1
+#
+# Conditional build:
+%bcond_without static_libs # static library
+%bcond_without capi # API 2.0 support
+%bcond_without gui # Qt based GUI
+#
Summary: Userspace part of Modular ISDN stack
Summary(pl.UTF-8): Część stosu modularnego ISDN (mISDN) dla przestrzeni użytkownika
Name: mISDNuser
-Version: 1.1.9
+Version: 2.0.19
Release: 1
-License: LGPL
+License: LGPL v2.1
Group: Libraries
-Source0: http://www.misdn.org/downloads/releases/%{name}-%{_ver}.tar.gz
-# Source0-md5: 16f44afd62c60eefbb5cc930c64a342f
-Patch0: %{name}-build.patch
+# git clone git://git.misdn.eu/mISDNuser.git
+# git archive --format=tar --prefix=mISDNuser-2.0.19/ v2.0.19 | xz > ../mISDNuser-2.0.19.tar.xz
+Source0: %{name}-%{version}.tar.xz
+# Source0-md5: fb4bf6c110bea0a30486015ca56e80d8
URL: http://www.isdn4linux.de/mISDN/
-BuildRequires: mISDN-devel >= %{version}
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake
+%{?with_capi:BuildRequires: capi4k-utils-devel}
+BuildRequires: libtool >= 2:2
+%{?with_capi:BuildRequires: spandsp-devel}
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+%if %{with gui}
+BuildRequires: QtCore-devel >= 4
+BuildRequires: qt4-qmake >= 4
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -28,9 +44,8 @@ komunikacji z mISDN.
%package devel
Summary: Development files Modular ISDN stack
Summary(pl.UTF-8): Pliki nagłówkowe stosu modularnego ISDN
-Group: Libraries
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: mISDN-devel
%description devel
This package contains the development files for userspace libraries
@@ -43,10 +58,23 @@ użytkownika służących do komunikacji z mISDN. Jest potrzebny do
kompilacji aplikacji używających bezpośrednio mISDN, takich jak
OpenPBX.
+%package static
+Summary: Static mISDN library
+Summary(pl.UTF-8): Statyczna biblioteka mISDN
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description static
+Static mISDN library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka mISDN.
+
%package utils
Summary: Debugging utilities for Modular ISDN stack
Summary(pl.UTF-8): Narzędzia diagnostyczne dla stosu modularnego ISDN
Group: Applications/System
+Obsoletes: mISDN-init < 2
%description utils
mISDN (modular ISDN) is intended to be the new ISDN stack for the
@@ -58,23 +86,67 @@ mISDN (modularny ISDN) ma być nowym stosem ISDN dla jądra Linuksa 2.6
tworzonym przez maintainera obecnego kodu isdn4linux. Ten pakiet
zawiera narzędzia testowe dla mISDN.
+%package capi
+Summary: mISDN CAPI support
+Summary(pl.UTF-8): mISDN - obsługa CAPI
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+Requires: capi4k-utils-libs
+
+%description capi
+mISDN CAPI support.
+
+%description capi -l pl.UTF-8
+mISDN - obsługa CAPI.
+
+%package gui
+Summary: GUI application for mISDN
+Summary(pl.UTF-8): Aplikacja z graficznym interfejsem użytkownika do mISDN
+Group: X11/Applications
+Requires: %{name} = %{version}-%{release}
+
+%description gui
+GUI application for mISDN.
+
+%description gui -l pl.UTF-8
+Aplikacja z graficznym interfejsem użytkownika do mISDN.
+
%prep
-%setup -q -n %{name}-%{_ver}
-%patch0 -p0
-rm -rf voip
+%setup -q
%build
-%{__make} -j1 \
- CC="%{__cc}" \
- CFLAGS="-I`pwd`/include %{rpmcflags}" \
- MISDNDIR=`pwd`
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+ QMAKE="/usr/bin/qmake-qt4" \
+ %{?with_capi:--enable-capi --enable-softdsp} \
+ %{?with_gui:--enable-gui} \
+ %{!?with_static_libs:--disable-static}
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+
%{__make} install \
- INSTALL_PREFIX=$RPM_BUILD_ROOT \
- MISDNDIR=`pwd` \
- LIBDIR=%{_libdir}
+ DESTDIR=$RPM_BUILD_ROOT
+
+%if %{with capi}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/capi/lib*.la
+# sample
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/capi20.conf
+%endif
+
+install -d $RPM_BUILD_ROOT/lib
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/udev $RPM_BUILD_ROOT/lib
+
+install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
+cat >$RPM_BUILD_ROOT%{systemdtmpfilesdir}/mISDNcapid.conf <<EOF
+d /var/run/mISDNcapid 755 root root -
+EOF
%clean
rm -rf $RPM_BUILD_ROOT
@@ -84,29 +156,45 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libisdnnet.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisdnnet.so.0
-%attr(755,root,root) %{_libdir}/libmISDN.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmISDN.so.0
-%attr(755,root,root) %{_libdir}/libsuppserv.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsuppserv.so.0
+%attr(755,root,root) %{_libdir}/libmisdn.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmisdn.so.1
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libisdnnet.so
-%attr(755,root,root) %{_libdir}/libmISDN.so
-%attr(755,root,root) %{_libdir}/libsuppserv.so
-%{_includedir}/mISDNuser
+%attr(755,root,root) %{_libdir}/libmisdn.so
+%{_libdir}/libmisdn.la
+%{_includedir}/mISDN
+
+%if %{with static_libs}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libmisdn.a
+%endif
%files utils
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/loadfirm
-%attr(755,root,root) %{_bindir}/mISDNdebugtool
-%attr(755,root,root) %{_bindir}/misdnportinfo
-%attr(755,root,root) %{_bindir}/sendhwctrl
-%attr(755,root,root) %{_bindir}/testcon
-%attr(755,root,root) %{_bindir}/testcon_l2
-%attr(755,root,root) %{_bindir}/testlayer1
-%attr(755,root,root) %{_bindir}/testlayer3
-%attr(755,root,root) %{_bindir}/testlib
-%attr(755,root,root) %{_bindir}/tstlib
+%attr(755,root,root) %{_bindir}/isdn_text2wireshark
+%attr(755,root,root) %{_bindir}/l1oipctrl
+%attr(755,root,root) %{_bindir}/misdn_E1test
+%attr(755,root,root) %{_bindir}/misdn_bridge
+%attr(755,root,root) %{_bindir}/misdn_info
+%attr(755,root,root) %{_bindir}/misdn_log
+%attr(755,root,root) %{_sbindir}/misdn_cleanl2
+%attr(755,root,root) %{_sbindir}/misdn_rename
+/lib/udev/rules.d/45-misdn.rules
+
+%if %{with capi}
+%files capi
+%defattr(644,root,root,755)
+%doc capi20/capi20.conf.sample
+%attr(755,root,root) %{_sbindir}/mISDNcapid
+%attr(755,root,root) %{_libdir}/capi/lib_capi_mod_misdn.so*
+%dir /var/run/mISDNcapid
+%{systemdtmpfilesdir}/mISDNcapid.conf
+%endif
+
+%if %{with gui}
+%files gui
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qmisdnwatch
+%endif
diff --git a/mISDNuser-build.patch b/mISDNuser-build.patch
deleted file mode 100644
index 4fd5df2..0000000
--- a/mISDNuser-build.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Index: i4lnet/Makefile
-===================================================================
-RCS file: /i4ldev/mISDNuser/i4lnet/Makefile,v
-retrieving revision 1.7
-diff -u -p -r1.7 Makefile
---- i4lnet/Makefile 18 Oct 2006 12:32:20 -0000 1.7
-+++ i4lnet/Makefile 16 Dec 2006 16:24:07 -0000
-@@ -2,12 +2,18 @@ CC = gcc
- AR = ar
- RANLIB = ranlib
-
--all: libisdnnet.a libisdnnet_pic.a libisdnnet.so
-+SOMAJOR=0
-+SOMINOR=0.0
-+SOVERSION=$(SOMAJOR).$(SOMINOR)
-+
-+all: libisdnnet.a libisdnnet_pic.a libisdnnet.so.$(SOVERSION)
-
- install:
-- install -m 644 libisdnnet.a $(INSTALL_PREFIX)/usr/lib
-- install -m 644 libisdnnet_pic.a $(INSTALL_PREFIX)/usr/lib
-- install -m 644 libisdnnet.so $(INSTALL_PREFIX)/usr/lib
-+ install -m 644 libisdnnet.a $(INSTALL_PREFIX)/$(LIBDIR)
-+ install -m 644 libisdnnet_pic.a $(INSTALL_PREFIX)/$(LIBDIR)
-+ install -m 755 libisdnnet.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)
-+ ln -sf libisdnnet.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libisdnnet.so.$(SOMAJOR)
-+ ln -sf libisdnnet.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libisdnnet.so
- cp *.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
-
- ISDNNET_OBJ = net_if.o isdn_debug.o isdn_msg.o fsm.o net_l2.o tei.o net_l3.o \
-@@ -22,8 +28,8 @@ libisdnnet.a: $(ISDNNET_OBJ)
- $(AR) cru $@ $^
- $(RANLIB) $@
-
--libisdnnet.so: $(ISDNNET_OBJ)
-- $(CC) $(CFLAGS) -shared -Xlinker -x -o $@ $^
-+libisdnnet.so.$(SOVERSION): $(ISDNNET_PICOBJ)
-+ $(CC) $(CFLAGS) -shared -Xlinker -x -Wl,-soname,libisdnnet.so.$(SOMAJOR) -o $@ $^
-
- .c.o:
- $(CC) $(CFLAGS) -o $@ -c $<
-Index: lib/Makefile
-===================================================================
-RCS file: /i4ldev/mISDNuser/lib/Makefile,v
-retrieving revision 1.8
-diff -u -p -r1.8 Makefile
---- lib/Makefile 18 Oct 2006 07:10:23 -0000 1.8
-+++ lib/Makefile 16 Dec 2006 16:24:07 -0000
-@@ -2,12 +2,18 @@ CC = gcc
- AR = ar
- RANLIB = ranlib
-
--all: libmISDN.a libmISDN_pic.a libmISDN.so
-+SOMAJOR=0
-+SOMINOR=0.0
-+SOVERSION=$(SOMAJOR).$(SOMINOR)
-+
-+all: libmISDN.a libmISDN_pic.a libmISDN.so.$(SOVERSION)
-
- install:
-- install -m 644 libmISDN.so $(INSTALL_PREFIX)/usr/lib
-- install -m 644 libmISDN_pic.a $(INSTALL_PREFIX)/usr/lib
-- install -m 644 libmISDN.a $(INSTALL_PREFIX)/usr/lib
-+ install -m 755 libmISDN.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)
-+ ln -sf libmISDN.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libmISDN.so.$(SOMAJOR)
-+ ln -sf libmISDN.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libmISDN.so
-+ install -m 644 libmISDN_pic.a $(INSTALL_PREFIX)/$(LIBDIR)
-+ install -m 644 libmISDN.a $(INSTALL_PREFIX)/$(LIBDIR)
-
- LIBMISDN_OBJS = device.o layer.o stack.o status.o
- LIBMISDN_PICOBJS = $(LIBMISDN_OBJS:%.o=%.lo)
-@@ -20,8 +26,8 @@ libmISDN.a: $(LIBMISDN_OBJS)
- $(AR) cru $@ $^
- $(RANLIB) $@
-
--libmISDN.so: $(LIBMISDN_OBJS)
-- $(CC) $(CFLAGS) -shared -Xlinker -x -o $@ $^
-+libmISDN.so.$(SOVERSION): $(LIBMISDN_PICOBJS)
-+ $(CC) $(CFLAGS) -shared -Xlinker -x -Wl,-soname,libmISDN.so.$(SOMAJOR) -o $@ $^
-
- .c.o:
- $(CC) $(CFLAGS) -o $@ -c $<
-Index: suppserv/Makefile
-===================================================================
-RCS file: /i4ldev/mISDNuser/suppserv/Makefile,v
-retrieving revision 1.7
-diff -u -p -r1.7 Makefile
---- suppserv/Makefile 18 Oct 2006 12:32:21 -0000 1.7
-+++ suppserv/Makefile 16 Dec 2006 16:24:07 -0000
-@@ -7,14 +7,20 @@ RANLIB = ranlib
- SUPPSERV_OBJ = asn1.o asn1_enc.o asn1_generic.o asn1_aoc.o asn1_basic_service.o asn1_comp.o asn1_diversion.o asn1_address.o fac.o
- SUPPSERV_PICOBJ = $(SUPPSERV_OBJ:%.o=%.lo)
-
--all: libsuppserv.a libsuppserv_pic.a libsuppserv.so
-+SOMAJOR=0
-+SOMINOR=0.0
-+SOVERSION=$(SOMAJOR).$(SOMINOR)
-+
-+all: libsuppserv.a libsuppserv_pic.a libsuppserv.so.$(SOVERSION)
-
- main: $(SUPPSERVOBJ)
-
- install:
-- install -m 644 libsuppserv.a $(INSTALL_PREFIX)/usr/lib
-- install -m 644 libsuppserv_pic.a $(INSTALL_PREFIX)/usr/lib
-- install -m 644 libsuppserv.so $(INSTALL_PREFIX)/usr/lib
-+ install -m 644 libsuppserv.a $(INSTALL_PREFIX)/$(LIBDIR)
-+ install -m 644 libsuppserv_pic.a $(INSTALL_PREFIX)/$(LIBDIR)
-+ install -m 755 libsuppserv.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)
-+ ln -sf libsuppserv.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libsuppserv.so.$(SOMAJOR)
-+ ln -sf libsuppserv.so.$(SOVERSION) $(INSTALL_PREFIX)/$(LIBDIR)/libsuppserv.so
- cp *.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
-
- libsuppserv_pic.a: $(SUPPSERV_PICOBJ)
-@@ -25,8 +31,8 @@ libsuppserv.a: $(SUPPSERV_OBJ)
- $(AR) cru $@ $<
- $(RANLIB) $@
-
--libsuppserv.so: $(SUPPSERV_OBJ)
-- $(CC) -shared -Xlinker -x -o $@ $^
-+libsuppserv.so.$(SOVERSION): $(SUPPSERV_PICOBJ)
-+ $(CC) $(CFLAGS) -shared -Xlinker -x -Wl,-soname,libsuppserv.so.$(SOMAJOR) -o $@ $^
-
-
- .c.o:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mISDNuser.git/commitdiff/8009035127052cb1307293505892d399eb908e00
More information about the pld-cvs-commit
mailing list