Changes - j0ke.net Open Build Service

Changes of Revision 16

[-] [+]	Changed	mISDN.spec
@@ -1,5 +1,5 @@ # -# spec file for package mISDN (Version 1.1.7.2) +# spec file for package mISDN (Version 1.1.8) # # @@ -8,20 +8,20 @@ Name: mISDN -BuildRequires: kernel-source kernel-syms udev newt-devel wget module-init-tools +BuildRequires: kernel-source kernel-syms udev newt-devel wget module-init-tools +PreReq: /bin/cat /bin/rm /usr/bin/grep URL: http://www.misdn.org -Summary: modular ISDN driver architecture +Summary: Modular ISDN driver architecture Version: 1_1_8 -Release: 1 +Release: 5.1 License: GNU General Public License (GPL) Group: Productivity/Telephony/Utilities Requires: zaptel Excludearch: s390 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: mISDN-%{version}.tar.bz2 +Source0: mISDN-%{version}.tar.bz2 Source1: preamble -##Patch0: misdn-openvox_1_1_8.patch -##Patch1: mISDN-1_1_8.diff + %suse_kernel_module_package -p %_sourcedir/preamble kdump um iseries64 ppc64 debug @@ -34,7 +34,7 @@ Karsten Keil %package KMP -Summary: mISDN Telephony Interface Drivers +Summary: Misdn Telephony Interface Drivers Group: System/Kernel %description KMP @@ -47,30 +47,38 @@ -------- Karsten Keil -%package devel -Summary: Development files for mISDN -Group: Development/Libraries -PreReq: mISDN - -%description devel -This package contains the header files and libraries necessary for -developing applications which use mISDN. - - -Install mISDN-devel if you want to develop applications which depend on -mISDN. - -Authors: --------- - Karsten Keil +%package devel +Summary: Development files for mISDN +Group: Development/Libraries +PreReq: mISDN + +%description devel +This package contains the header files and libraries necessary for +developing applications which use mISDN. + + +Install mISDN-devel if you want to develop applications which depend on +mISDN. + +Authors: +-------- + Karsten Keil %prep %setup -n mISDN-%{version} -##%patch0 -p1 -##%patch1 -p1 + %build + #make misdn-init INSTALL_PREFIX="%{buildroot}" LIBDIR="%{_libdir}" KDIR=/usr/src/linux-obj/%_target_cpu/default +#cd .. +#mkdir -p obj +#for flavor in %flavors_to_build; do + #rm -rf obj/$flavor + #cp -r mISDN-%{version} obj/$flavor + #make -C $PWD/obj/$flavor LIBDIR=%{_libdir} KDIR=/usr/src/linux-obj/%_target_cpu/$flavor install \ + #M=$PWD/obj/$flavor KERNELPATH=/usr/src/linux-obj/%_target_cpu/$flavor +#done export EXTRA_CFLAGS='-DVERSION=\"%version\"' make misdn-init INSTALL_PREFIX="%{buildroot}" LIBDIR="%{_libdir}" MODS=/usr/src/linux-obj/%_target_cpu/default KDIR=/usr/src/linux-obj/%_target_cpu/default install cd .. @@ -80,7 +88,7 @@ cp -r mISDN-%{version} obj/$flavor #make -C /usr/src/linux-obj/%_target_cpu/$flavor \ #M=$PWD/obj/$flavor - make -C obj/$flavor INSTALL_PREFIX="%{buildroot}" LIBDIR="%{_libdir}" KDIR=/usr/src/linux-obj/%_target_cpu/$flavor MODS=/usr/src/linux-obj/%_target_cpu/$flavor + make -C obj/$flavor INSTALL_PREFIX="%{buildroot}" LIBDIR="%{_libdir}" KDIR=/usr/src/linux-obj/%_target_cpu/$flavor MODS=/usr/src/linux-obj/%_target_cpu/$flavor done %install @@ -92,36 +100,38 @@ M=$PWD/obj/$flavor/drivers/isdn/hardware/mISDN done + + + %clean rm -rf %buildroot %post -%{?run_ldconfig:%run_ldconfig} -ln -sf /usr/bin/mISDN /etc/init.d/mISDN +/sbin/ldconfig +ln -sf /usr/sbin/mISDN /etc/init.d/mISDN + +%postun -p /sbin/ldconfig -%postun -%{?run_ldconfig:%run_ldconfig} -rm -f /etc/init.d/mISDN %files %defattr(-,root,root,-) -%{_libdir}/mISDN/mISDN.conf.bnx.xsl -%{_libdir}/mISDN/mISDN.conf.hfcmulti.xsl -%{_libdir}/mISDN/mISDN.conf.inc.xsl -%{_libdir}/mISDN/mISDN.conf.l1oip.xsl -%{_libdir}/mISDN/mISDN.conf.mISDN_debugtool.xsl -%{_libdir}/mISDN/mISDN.conf.mISDN_dsp.xsl -%{_libdir}/mISDN/mISDN.conf.singlepci.xsl -%{_libdir}/mISDN/mISDN.conf.xsl -%{_libdir}/mISDN/mISDN.conf.hfcsusb.xsl -%{_libdir}/mISDN/mISDN.conf.xhfc.xsl +%{_libdir}/mISDN.conf.bnx.xsl +%{_libdir}/mISDN.conf.hfcmulti.xsl +%{_libdir}/mISDN.conf.inc.xsl +%{_libdir}/mISDN.conf.l1oip.xsl +%{_libdir}/mISDN.conf.mISDN_debugtool.xsl +%{_libdir}/mISDN.conf.mISDN_dsp.xsl +%{_libdir}/mISDN.conf.singlepci.xsl +%{_libdir}/mISDN.conf.xsl +%{_libdir}/mISDN.conf.hfcsusb.xsl +%{_libdir}/mISDN.conf.xhfc.xsl /usr/sbin/mISDN /usr/sbin/misdn-init /etc/modprobe.d/mISDN /etc/modules.d/mISDN -%files devel -%defattr(-,root,root,-) +%files devel +%defattr(-,root,root,-) /usr/include/linux/isdn_compat.h /usr/include/linux/mISDNdebugtool.h /usr/include/linux/mISDNif.h
[-] [+]	Deleted	mISDN-1_1_8.diff ^
@@ -1,22 +0,0 @@ ---- mISDN-1_1_7_2/Makefile.orig 2008-02-06 14:09:26.000000000 +0100 -+++ mISDN-1_1_7_2/Makefile 2008-02-06 14:10:02.000000000 +0100 -@@ -15,7 +15,7 @@ - endif - - MODS=/lib/modules/$(KVERS) --LINUX=$(MODS)/build -+LINUX=$(KSRC) - LINUX_SOURCE=$(MODS)/source - UPDATE_MODULES=$(shell which update-modules) - MODULES_UPDATE=$(shell which modules-update) ---- mISDN-1_1_7_2/config/Makefile.orig 2008-02-06 14:38:55.000000000 +0100 -+++ mISDN-1_1_7_2/config/Makefile 2008-02-06 14:39:25.000000000 +0100 -@@ -4,7 +4,7 @@ - - install: - install -D -m755 mISDN $(INSTALL_PREFIX)/usr/sbin/mISDN -- for file in $(shell echo .xsl); do install -D -m644 $${file} $(INSTALL_PREFIX)/usr/lib/mISDN/$${file}; done -+ for file in $(shell echo .xsl); do install -D -m644 $${file} $(INSTALL_PREFIX)/$(LIBDIR)/mISDN/$${file}; done - if [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \ - if [ -e $(INSTALL_PREFIX)/etc/init.d/mISDN ]; then rm -rf $(INSTALL_PREFIX)/etc/init.d/mISDN; fi; \ - ln -s $(INSTALL_PREFIX)/usr/sbin/mISDN $(INSTALL_PREFIX)/etc/init.d/mISDN; \
[-] [+]	Changed	misdn-2.6.24.diff ^
@@ -329,5 +329,3 @@ #endif /* __KERNEL__ */ - -
[-] [+]	Deleted	misdn-openvox_1_1_8.patch ^
@@ -1,42 +0,0 @@ ---- mISDN-1_1_7.orig/drivers/isdn/hardware/mISDN/hfc_multi.c 2007-11-09 11:15:52.000000000 +0100 -+++ mISDN-1_1_7/drivers/isdn/hardware/mISDN/hfc_multi.c 2008-01-04 11:49:43.000000000 +0100 -@@ -210,6 +210,8 @@ - "HFC-8S", 0, 8, 1, 0, 0}, - {CCAG_VID, CCAG_VID, HFC8S_ID, 0xB622, VENDOR_CCD, - "HFC-8S", 0, 8, 1, 0, 0}, -+ {CCAG_VID, CCAG_VID, HFC8S_ID, 0xe998, VENDOR_CCD, -+ "HFC-8S OpenVox Card", 0, 8, 1, 8, 0}, - {CCAG_VID, CCAG_VID, HFC8S_ID, 0xB562, VENDOR_CCD, - "HFC-8S Beronet Card", 0, 8, 1, 0, 0}, - {CCAG_VID, CCAG_VID, HFC8S_ID, 0xB56B, VENDOR_CCD, -@@ -236,8 +238,12 @@ - "HFC-2S Beronet Card (mini PCI)", 0, 2, 1, 3, 0}, - {CCAG_VID, CCAG_VID, HFC4S_ID, 0xB567, VENDOR_CCD, - "HFC-1S Beronet Card (mini PCI)", 0, 1, 1, 3, 0}, -+ {CCAG_VID, CCAG_VID, HFC4S_ID, 0xE884, VENDOR_CCD, -+ "HFC-2S OpenVox Card", 0, 2, 1, 2, 0}, /* Openvox B210P / - {CCAG_VID, CCAG_VID, HFC4S_ID, 0xE888, VENDOR_CCD, - "HFC-4S OpenVox Card", 0, 4, 1, 2, 0}, -+ {CCAG_VID, CCAG_VID, HFC4S_ID, 0xE884, VENDOR_CCD, -+ "HFC-2S OpenVox Card", 0, 2, 1, 2, 0}, /* Openvox B210P 0,2,1,2(LEDS),0 / - {CCAG_VID, CCAG_VID, HFC4S_ID, 0xE884, VENDOR_CCD, - "HFC-2S OpenVox Card", 0, 2, 1, 2, 0}, - {0, 0, 0, 0, NULL, NULL, 0, 0, 0, 0}, -@@ -4438,6 +4445,9 @@ - { CCAG_VID, 0x16B8 , CCAG_VID, 0xB522, 0, 0, 0 }, //IOB8ST - { CCAG_VID, 0x16B8 , CCAG_VID, 0xB552, 0, 0, 0 }, //IOB8ST - { CCAG_VID, 0x16B8 , CCAG_VID, 0xB622, 0, 0, 0 }, //8S -+ { CCAG_VID, 0x16B8 , CCAG_VID, 0xB622, 0, 0, 0 }, //8S -+ { CCAG_VID, 0x16B8 , CCAG_VID, 0xe998, 0, 0, 0 }, //8S Openvox B800P -+ - - - /* Cards with HFC-E1 Chip**/ -@@ -4458,6 +4468,7 @@ - #endif - { 0x10B5, 0x9030 , CCAG_VID, 0x3136 , 0, 0, 0 }, // PLX PCI Bridge - { 0x10B5, 0x9030 , PCI_ANY_ID, PCI_ANY_ID , 0, 0, 0 }, // PLX PCI Bridge -+ { CCAG_VID, 0x08B4 , CCAG_VID, 0xE884, 0, 0, 0 }, //HFC4S_ID add line - {0, } - }; - MODULE_DEVICE_TABLE(pci, hfmultipci_ids);
[-] [+]	Changed	mISDN-1_1_8.tar.bz2/Makefile ^
@@ -14,9 +14,11 @@ KVERS:=$(shell uname -r) endif +ifndef KDIR MODS=/lib/modules/$(KVERS) -LINUX=$(MODS)/build -LINUX_SOURCE=$(MODS)/source +endif +LINUX=$(MODS) +LINUX_SOURCE=/usr/src/source UPDATE_MODULES=$(shell which update-modules) MODULES_UPDATE=$(shell which modules-update) DEPMOD=$(shell which depmod)
[-] [+]	Changed	mISDN-1_1_8.tar.bz2/config/Makefile ^
@@ -4,7 +4,7 @@ install: install -D -m755 mISDN $(INSTALL_PREFIX)/usr/sbin/mISDN - for file in $(shell echo .xsl); do install -D -m644 $${file} $(INSTALL_PREFIX)/usr/lib/mISDN/$${file}; done + for file in $(shell echo .xsl); do install -D -m644 $${file} $(INSTALL_PREFIX)/$(LIBDIR)/$${file}; done if [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \ if [ -e $(INSTALL_PREFIX)/etc/init.d/mISDN ]; then rm -rf $(INSTALL_PREFIX)/etc/init.d/mISDN; fi; \ ln -s $(INSTALL_PREFIX)/usr/sbin/mISDN $(INSTALL_PREFIX)/etc/init.d/mISDN; \