packages (mISDN-v2): mISDNuser/mISDNuser-build.patch, mISDNuser/mISDNuser.s...
jajcus
jajcus at pld-linux.org
Fri Jun 12 20:23:07 CEST 2009
Author: jajcus Date: Fri Jun 12 18:23:07 2009 GMT
Module: packages Tag: mISDN-v2
---- Log message:
- mISDN v2 (new branch)
---- Files affected:
packages/mISDNuser:
mISDNuser-build.patch (1.2 -> 1.2.2.1) , mISDNuser.spec (1.22 -> 1.22.2.1)
---- Diffs:
================================================================
Index: packages/mISDNuser/mISDNuser-build.patch
diff -u packages/mISDNuser/mISDNuser-build.patch:1.2 packages/mISDNuser/mISDNuser-build.patch:1.2.2.1
--- packages/mISDNuser/mISDNuser-build.patch:1.2 Wed May 30 15:22:49 2007
+++ packages/mISDNuser/mISDNuser-build.patch Fri Jun 12 20:23:01 2009
@@ -1,125 +1,47 @@
-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
+diff -durN -x '*~' mISDNuser.orig/Makefile mISDNuser/Makefile
+--- mISDNuser.orig/Makefile 2008-09-18 08:14:29.000000000 +0200
++++ mISDNuser/Makefile 2009-06-12 20:21:25.000000000 +0200
+@@ -36,7 +36,7 @@
+
+ export CFLAGS
+
+-SUBDIRS := lib bridge tools example l1oip
++SUBDIRS := lib bridge tools l1oip
+
+
+ all:
+diff -durN -x '*~' mISDNuser.orig/lib/Makefile mISDNuser/lib/Makefile
+--- mISDNuser.orig/lib/Makefile 2008-09-18 08:14:29.000000000 +0200
++++ mISDNuser/lib/Makefile 2009-06-12 20:21:12.000000000 +0200
+@@ -2,13 +2,18 @@
AR = ar
RANLIB = ranlib
--all: libisdnnet.a libisdnnet_pic.a libisdnnet.so
+-all: libmisdn.a libmisdn_pic.a libmisdn.so
+SOMAJOR=0
+SOMINOR=0.0
+SOVERSION=$(SOMAJOR).$(SOMINOR)
+
-+all: libisdnnet.a libisdnnet_pic.a libisdnnet.so.$(SOVERSION)
++all: libmisdn.a libmisdn_pic.a libmisdn.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/
+ install -d $(INSTALL_PREFIX)$(INSTALL_LIBDIR)
+ install -m 644 libmisdn.a $(INSTALL_PREFIX)$(INSTALL_LIBDIR)
+ install -m 644 libmisdn_pic.a $(INSTALL_PREFIX)$(INSTALL_LIBDIR)
+- install -m 644 libmisdn.so $(INSTALL_PREFIX)$(INSTALL_LIBDIR)
++ install -m 644 libmisdn.so.$(SOVERSION) $(INSTALL_PREFIX)$(INSTALL_LIBDIR)
++ ln -s libmisdn.so.$(SOVERSION) $(INSTALL_PREFIX)$(INSTALL_LIBDIR)/libmisdn.so
- 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)
+ MISDN_OBJ = debug.o mbuffer.o q931.o fsm.o mtimer.o mlayer3.o layer3.o dss1user.o dss1net.o
- 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)
+@@ -29,8 +34,8 @@
$(AR) cru $@ $^
$(RANLIB) $@
--libmISDN.so: $(LIBMISDN_OBJS)
+-libmisdn.so: $(MISDN_OBJ)
- $(CC) $(CFLAGS) -shared -Xlinker -x -o $@ $^
-+libmISDN.so.$(SOVERSION): $(LIBMISDN_PICOBJS)
-+ $(CC) $(CFLAGS) -shared -Xlinker -x -Wl,-soname,libmISDN.so.$(SOMAJOR) -o $@ $^
++libmisdn.so.$(SOVERSION): $(MISDN_OBJ)
++ $(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:
================================================================
Index: packages/mISDNuser/mISDNuser.spec
diff -u packages/mISDNuser/mISDNuser.spec:1.22 packages/mISDNuser/mISDNuser.spec:1.22.2.1
--- packages/mISDNuser/mISDNuser.spec:1.22 Thu Feb 26 13:48:55 2009
+++ packages/mISDNuser/mISDNuser.spec Fri Jun 12 20:23:01 2009
@@ -1,37 +1,39 @@
# $Revision$, $Date$
-%define _ver %(echo %{version} | tr . _).1
-Summary: Userspace part of Modular ISDN stack
-Summary(pl.UTF-8): Część stosu modularnego ISDN (mISDN) dla przestrzeni użytkonika
+%define _snap 20090602
+Summary: Userspace part of Modular ISDN stack v2
+Summary(pl.UTF-8): Część stosu modularnego ISDN (mISDN v2) dla przestrzeni użytkonika
Name: mISDNuser
-Version: 1.1.9
-Release: 1
+Version: 2.0
+Release: 0.%{_snap}.1
License: LGPL
Group: Libraries
-Source0: http://www.misdn.org/downloads/releases/%{name}-%{_ver}.tar.gz
-# Source0-md5: 16f44afd62c60eefbb5cc930c64a342f
+Source0: http://www.linux-call-router.de/download/lcr-1.5/%{name}_%{_snap}.tar.gz
+# Source0-md5: 3288ec912031e5840f2d07134ab8d3d6
Patch0: %{name}-build.patch
URL: http://www.isdn4linux.de/mISDN/
-BuildRequires: mISDN-devel >= %{version}
+BuildRequires: linux-libc-headers >= 2.6.29
+BuildConflicts: mISDN-devel < 2.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-mISDN (modular ISDN) is intended to be the new ISDN stack for the
-Linux 2.6 kernel, from the maintainer of the existing isdn4linux code.
-This package contains the userspace libraries required to interface
-directly to mISDN.
+mISDN (modular ISDN) is the new ISDN stack for the Linux 2.6 kernel,
+from the maintainer of the existing isdn4linux code. mISDN v2 has been
+included in the mainline kernel since 2.6.29. This package contains
+the userspace libraries required to interface directly to mISDN.
%description -l pl.UTF-8
-mISDN (modularny ISDN) ma być nowym stosem ISDN dla jądra Linuksa 2.6
-tworzonym przez maintainera obecnego kodu isdn4linux. Ten pakiet
-zawiera biblioteki przestrzeni użytkownika potrzebne do bezpośredniej
-komunikacji z mISDN.
+mISDN (modularny ISDN) jest nowym stosem ISDN dla jądra Linuksa 2.6
+tworzonym przez maintainera obecnego kodu isdn4linux. Wersja druga
+mISDN jest już włączona do oficjalnego kodu jądra, od wersji
+2.6.29. Ten pakiet zawiera biblioteki przestrzeni użytkownika
+potrzebne do bezpośredniej komunikacji z mISDN.
%package devel
Summary: Development files Modular ISDN stack
Summary(pl.UTF-8): Pliki nagłówkowe stosu modularnego ISDN
Group: Libraries
Requires: %{name} = %{version}-%{release}
-Requires: mISDN-devel
+Requires: linux-libc-headers >= 2.6.29
%description devel
This package contains the development files for userspace libraries
@@ -44,25 +46,40 @@
kompilacji aplikacji używających bezpośrednio mISDN, takich jak
OpenPBX.
+%package static
+Summary: Static libraries for Modular ISDN stack
+Summary(pl.UTF-8): Biblioteki statyczne stosu modularnego ISDN
+Group: Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+This package contains static libraries for userspace libraries
+required to interface to mISDN, needed for compiling applications
+which use mISDN directly such as OpenPBX.
+
+%description static -l pl.UTF-8
+Ten pakiet zawiera bibliotek statyczne przestrzeni użytkownika
+służących do komunikacji z mISDN. Jest potrzebny do kompilacji
+aplikacji używających bezpośrednio mISDN, takich jak OpenPBX.
+
%package utils
-Summary: Debugging utilities for Modular ISDN stack
-Summary(pl.UTF-8): Narzędzia diagnostyczne dla stosu modularnego ISDN
+Summary: Utilities for Modular ISDN stack
+Summary(pl.UTF-8): Narzędzia dla stosu modularnego ISDN
Group: Applications/System
%description utils
mISDN (modular ISDN) is intended to be the new ISDN stack for the
Linux 2.6 kernel, from the maintainer of the existing isdn4linux code.
-This package contains test utilities for mISDN.
+This package contains utilities for mISDN.
%description utils -l pl.UTF-8
-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.
+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 dla mISDN.
%prep
-%setup -q -n %{name}-%{_ver}
-%patch0 -p0
-rm -rf voip
+%setup -q -n %{name}
+%patch0 -p1
%build
%{__make} -j1 \
@@ -85,6 +102,7 @@
%files
%defattr(644,root,root,755)
+%doc
%attr(755,root,root) %{_libdir}/*.so.*
%files devel
@@ -92,6 +110,10 @@
%attr(755,root,root) %{_libdir}/*.so
%{_includedir}/mISDNuser
+%files static
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/*.a
+
%files utils
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/*
@@ -102,6 +124,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.22.2.1 2009/06/12 18:23:01 jajcus
+- mISDN v2 (new branch)
+
Revision 1.22 2009/02/26 12:48:55 marcus
- md5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mISDNuser/mISDNuser-build.patch?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mISDNuser/mISDNuser.spec?r1=1.22&r2=1.22.2.1&f=u
More information about the pld-cvs-commit
mailing list