Author: oden
Date: Mon Oct 23 18:35:54 2006
New Revision: 71961
Added:
packages/cooker/misdn/current/SOURCES/mISDN.tar.bz2 (contents, props
changed)
packages/cooker/misdn/current/SOURCES/mISDNuser-20061023.tar.bz2
(contents, props changed)
packages/cooker/misdn/current/SOURCES/mISDNuser-shared.diff
Removed:
packages/cooker/misdn/current/SOURCES/mISDN_for_PBX4Linux_2005_03_06-gcc4.diff
packages/cooker/misdn/current/SOURCES/mISDNuser-CVS-2004-07-08-cvs_fixes.diff
packages/cooker/misdn/current/SOURCES/mISDNuser-CVS-2004-08-29-shared.diff
packages/cooker/misdn/current/SOURCES/mISDNuser_for_PBX4Linux-3.0.tar.bz2
Modified:
packages/cooker/misdn/current/SPECS/misdn.spec
Log:
- update to the latest code from cvs (3.4+)
- rediff the shared patch
- bundle the kernel headers as a tar ball
Added: packages/cooker/misdn/current/SOURCES/mISDN.tar.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/misdn/current/SOURCES/mISDNuser-20061023.tar.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/misdn/current/SOURCES/mISDNuser-shared.diff
==============================================================================
--- (empty file)
+++ packages/cooker/misdn/current/SOURCES/mISDNuser-shared.diff Mon Oct 23
18:35:54 2006
@@ -0,0 +1,163 @@
+diff -Naur mISDNuser/Makefile mISDNuser.oden/Makefile
+--- mISDNuser/Makefile 2006-10-19 17:04:02.000000000 -0400
++++ mISDNuser.oden/Makefile 2006-10-23 11:44:08.000000000 -0400
+@@ -1,9 +1,3 @@
+-#
+-# Set this to your local copy of mISDN
+-#
+-MISDNDIR := /usr/src/mqueue/mISDN
+-
+-
+ PWD=$(shell pwd)
+ #
+ # Change this to create an install prefix for the shared libs, programms and
+@@ -12,9 +6,6 @@
+ INSTALL_PREFIX := /
+ export INSTALL_PREFIX
+
+-MISDNINCLUDEDIR := $(MISDNDIR)/include
+-export MISDNINCLUDEDIR
+-
+ mISDN_DIR := $(PWD)
+ export mISDN_DIR
+
+@@ -24,25 +15,24 @@
+ LIBDIR=/usr/lib
+ export LIBDIR
+
+-CFLAGS:= -g -Wall -O2 -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR)
+-CFLAGS+= -D CLOSE_REPORT=1
++CFLAGS:= $(RPM_OPT_FLAGS) -fPIC -I$(INCLUDEDIR)
++CFLAGS+= -DCLOSE_REPORT=1
+ export CFLAGS
+
+-mISDNLIB := $(PWD)/lib/libmISDN.a
+-mISDNNETLIB := $(PWD)/i4lnet/libmisdnnet.a
++mISDNLIB := $(PWD)/lib/libmISDN.so $(PWD)/lib/libmISDN.a
++mISDNNETLIB := $(PWD)/i4lnet/libmisdnnet.so $(PWD)/i4lnet/libmisdnnet.a
+ export mISDNLIB
+ export mISDNNETLIB
+
+-SUBDIRS := lib example
++SUBDIRS := lib
+
+ SUBDIRS += $(shell if test -d i4lnet ; then echo i4lnet; fi)
+ SUBDIRS += $(shell if test -d tenovis ; then echo tenovis; fi)
+-SUBDIRS += $(shell if test -d voip ; then echo voip; fi)
+ SUBDIRS += $(shell if test -d suppserv ; then echo suppserv; fi)
+
+-LIBS := lib/libmISDN.a
++LIBS := lib/libmISDN.so lib/libmISDN.a
+
+-all: test_misdn_includes
++all:
+ $(MAKE) TARGET=$@ subdirs
+
+
+@@ -95,8 +85,3 @@
+ voiparchiv: ARCHIVNAME := $(ARCHIVDIR)/$(MAINDIR)_voip-$(VERSION).tar.bz2
+ voiparchiv: archiv
+
+-
+-test_misdn_includes:
+- @if ! echo "#include <linux/mISDNif.h>" | gcc -I$(MISDNINCLUDEDIR) -C
-E - >/dev/null ; then echo -e "\n\nYou either don't seem to have installed
mISDN properly\nor you haven't set the MISDNDIR variable in this very
Makefile.\n\nPlease either install mISDN or set the MISDNDIR properly\n"; exit
1; fi
+-
+-
+diff -Naur mISDNuser/i4lnet/Makefile mISDNuser.oden/i4lnet/Makefile
+--- mISDNuser/i4lnet/Makefile 2006-10-18 08:32:20.000000000 -0400
++++ mISDNuser.oden/i4lnet/Makefile 2006-10-23 10:14:22.000000000 -0400
+@@ -22,8 +22,9 @@
+ $(AR) cru $@ $^
+ $(RANLIB) $@
+
+-libisdnnet.so: $(ISDNNET_OBJ)
+- $(CC) -shared -Xlinker -x -o $@ $^
++libisdnnet.so: $(ISDNNETOBJ)
++ $(CC) $(CFLAGS) -fPIC -Wl,-soname,libisdnnet.so.0 -shared -o
libisdnnet.so.0 \
++ $(ISDNNETOBJ)
+
+ .c.o:
+ $(CC) $(CFLAGS) -o $@ -c $<
+diff -Naur mISDNuser/lib/Makefile mISDNuser.oden/lib/Makefile
+--- mISDNuser/lib/Makefile 2006-10-18 03:10:23.000000000 -0400
++++ mISDNuser.oden/lib/Makefile 2006-10-23 10:14:42.000000000 -0400
+@@ -20,8 +20,9 @@
+ $(AR) cru $@ $^
+ $(RANLIB) $@
+
+-libmISDN.so: $(LIBMISDN_OBJS)
+- $(CC) -shared -Xlinker -x -o $@ $^
++libmISDN.so: $(LIBMISDN_OBJS)
++ $(CC) $(CFLAGS) -fPIC -Wl,-soname,libmISDN.so.0 -shared -o
libmISDN.so.0 \
++ $(LIBMISDN_OBJS)
+
+ .c.o:
+ $(CC) $(CFLAGS) -o $@ -c $<
+diff -Naur mISDNuser/suppserv/Makefile mISDNuser.oden/suppserv/Makefile
+--- mISDNuser/suppserv/Makefile 2006-10-18 08:32:21.000000000 -0400
++++ mISDNuser.oden/suppserv/Makefile 2006-10-23 10:16:17.000000000 -0400
+@@ -25,9 +25,9 @@
+ $(AR) cru $@ $<
+ $(RANLIB) $@
+
+-libsuppserv.so: $(SUPPSERV_OBJ)
+- $(CC) -shared -Xlinker -x -o $@ $^
+-
++libsuppserv.so: $(SUPPSERV_OBJ)
++ $(CC) $(CFLAGS) -fPIC -Wl,-soname,libsuppserv.so.0 -shared -o
libsuppserv.so.0 \
++ $(SUPPSERV_OBJ)
+
+ .c.o:
+ $(CC) $(CFLAGS) -o $@ -c $<
+diff -Naur mISDNuser/tenovis/Makefile mISDNuser.oden/tenovis/Makefile
+--- mISDNuser/tenovis/Makefile 2006-03-06 08:08:29.000000000 -0500
++++ mISDNuser.oden/tenovis/Makefile 2006-10-23 10:17:02.000000000 -0400
+@@ -1,6 +1,6 @@
+ LIBINCL := $(INCLUDEDIR)/mISDNlib.h
+
+-TENOVISLIB := lib/libtenovis.a
++TENOVISLIB := lib/libtenovis.so lib/libtenovis.a
+
+ TENOVISINC := lib/tenovis.h
+
+@@ -8,7 +8,7 @@
+
+ PROGS := testlib tstlib
+
+-all: sublib $(PROGS)
++all: sublib
+
+ install:
+ for i in $(PROGS) ; do \
+diff -Naur mISDNuser/tenovis/lib/Makefile mISDNuser.oden/tenovis/lib/Makefile
+--- mISDNuser/tenovis/lib/Makefile 2006-03-06 08:08:29.000000000 -0500
++++ mISDNuser.oden/tenovis/lib/Makefile 2006-10-23 10:18:25.000000000
-0400
+@@ -1,11 +1,15 @@
+
+-lib: libtenovis.a
++lib: libtenovis.so libtenovis.a
+
+ libtenovis.a: tenovis_device.o tenovis_intern.o
+ rm -f $@
+ ar -r $@ $^
+ ar -s $@
+
++libtenovis.so: tenovis_device.o tenovis_intern.o
++ $(CC) $(CFLAGS) -fPIC -Wl,-soname,libtenovis.so.0 -shared -o \
++ libtenovis.so.0 tenovis_device.o tenovis_intern.o
++
+ tenovis_device.o : tenovis_device.c tenovis.h tenovis_int.h \
+ ../../include/mISDNlib.h
+
+diff -Naur mISDNuser/include/mISDNlib.h mISDNuser.oden/include/mISDNlib.h
+--- mISDNuser/include/mISDNlib.h 2006-08-15 12:29:13.000000000 -0400
++++ mISDNuser.oden/include/mISDNlib.h 2006-10-23 11:42:58.000000000 -0400
+@@ -18,7 +18,7 @@
+
+ #include <sys/types.h>
+ #include <stdio.h>
+-#include "linux/mISDNif.h"
++#include "mISDNif.h"
+
+ #define mISDN_INBUFFER_SIZE 0x20000
+
Modified: packages/cooker/misdn/current/SPECS/misdn.spec
==============================================================================
--- packages/cooker/misdn/current/SPECS/misdn.spec (original)
+++ packages/cooker/misdn/current/SPECS/misdn.spec Mon Oct 23 18:35:54 2006
@@ -1,17 +1,18 @@
+%define snap 20061023
+
%define major 0
%define libname %mklibname misdn %{major}
Summary: Modular ISDN (mISDN) libraries
Name: misdn
-Version: 3.0
-Release: %mkrel 3
+Version: 3.4
+Release: %mkrel 0.%{snap}.1
Group: System/Libraries
License: GPL
URL: http://isdn.jolly.de/
-Source0:
http://isdn.jolly.de/download/v3.0/mISDNuser_for_PBX4Linux-%{version}.tar.bz2
-Patch0: mISDNuser-CVS-2004-08-29-shared.diff
-Patch1: mISDNuser-CVS-2004-07-08-cvs_fixes.diff
-Patch2: mISDN_for_PBX4Linux_2005_03_06-gcc4.diff
+Source0: mISDNuser-%{snap}.tar.bz2
+Source1: mISDN.tar.bz2
+Patch0: mISDNuser-shared.diff
Epoch: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -50,14 +51,22 @@
%prep
-%setup -q -n mISDNuser
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
+%setup -q -n mISDNuser -a1
+
+# fix strange perms
+find . -type f -exec chmod 644 {} \;
+find . -type d -exec chmod 755 {} \;
+
+# cvs cleanup
+for i in `find . -type d -name CVS` `find . -type d -name .svn` `find . -type
f -name .cvs\*` `find . -type f -name .#\*`; do
+ if [ -e "$i" ]; then rm -r $i; fi >&/dev/null
+done
+%patch0 -p1
+
%build
-make CFLAGS="%{optflags} -fPIC -DPIC -I\$(INCLUDEDIR)"
+%make
%install
[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
@@ -68,16 +77,20 @@
# install static libs
install -m0644 i4lnet/libisdnnet.a %{buildroot}%{_libdir}/
install -m0644 lib/libmISDN.a %{buildroot}%{_libdir}/
+install -m0644 suppserv/libsuppserv.a %{buildroot}%{_libdir}/
install -m0644 tenovis/lib/libtenovis.a %{buildroot}%{_libdir}/
# install shared libs
install -m0755 i4lnet/libisdnnet.so.%{major} %{buildroot}%{_libdir}/
install -m0755 lib/libmISDN.so.%{major} %{buildroot}%{_libdir}/
+install -m0755 suppserv/libsuppserv.so.%{major} %{buildroot}%{_libdir}/
install -m0755 tenovis/lib/libtenovis.so.%{major} %{buildroot}%{_libdir}/
+# make some softlinks
ln -s libisdnnet.so.%{major} %{buildroot}%{_libdir}/libisdnnet.so
ln -s libmISDN.so.%{major} %{buildroot}%{_libdir}/libmISDN.so
-ln -s libtenovis.so.%{major} %{buildroot}%{_libdir}/libtenovis.so
+ln -s libsuppserv.so.%{major} %{buildroot}%{_libdir}/libsuppserv.so
+ln -s lib/libtenovis.so.%{major} %{buildroot}%{_libdir}/libtenovis.so
# install headers
install -m0644 i4lnet/*.h %{buildroot}%{_includedir}/mISDNuser/
@@ -101,6 +114,7 @@
%files -n %{libname}
%defattr(-,root,root)
+%doc COPYING.LIB LICENSE
%{_libdir}/*.so.*
%files -n %{libname}-devel
@@ -109,3 +123,4 @@
%{_includedir}/mISDNuser/*.h
%{_libdir}/*.so
%{_libdir}/*.a
+
