Changes - j0ke.net Open Build Service

Changes of Revision 20

[-] [+]	Changed	dahdi-tools.changes
@@ -1,8 +1,32 @@ ------------------------------------------------------------------- +Mon Aug 27 005:36:34 UTC 2012 - jamesp@vicidial.com + +- Add provides dahdi-tools-devel for older package compatibility + +------------------------------------------------------------------- +Mon Jun 25 01:00:23 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 2.6.1 +* astribank: wait for udev to settle +* update the product ID database with new USB devices + +------------------------------------------------------------------- +Mon Mar 12 22:05:34 UTC 2012 - jengelh@medozas.de + +- Remove bogus patch (dahdi-tools-2.3.0-Makefile.patch) (bnc#750764) +- Obsolete dahdi-tools-soname.diff and use original SONAME + +------------------------------------------------------------------- +Thu Dec 15 23:48:37 UTC 2011 - jengelh@medozas.de + +- Update to new upstream release 2.6.0-rc1, changelog is at + http://downloads.asterisk.org/pub/telephony/dahdi-tools/ChangeLog-2.6.0-rc1 + +------------------------------------------------------------------- Mon Oct 10 19:30:47 UTC 2011 - chris@computersalat.de - fix deps for SLE_10 - * BuildReq dahdi-linux-devel +* BuildReq dahdi-linux-devel ------------------------------------------------------------------- Mon Oct 3 20:57:23 UTC 2011 - jengelh@medozas.de
[-] [+]	Changed	dahdi-tools.spec ^
@@ -1,7 +1,7 @@ # # spec file for package dahdi-tools # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,32 +15,35 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: dahdi-tools -Summary: Tools for the Zapata Telephony Interface Driver -Version: 2.5.0.1 -Release: 0 -License: GNU General Public License (GPL) +Summary: Tools for the Digium Asterisk Hardware Device Interface driver +License: GPL-2.0 Group: Productivity/Telephony/Utilities -Url: http://www.asterisk.org -Source0: http://downloads.asterisk.org/pub/telephony/%{name}/%{name}-%{version}.tar.bz2 +Version: 2.6.1 +Release: 0 +Url: http://asterisk.org/ +Source0: http://downloads.asterisk.org/pub/telephony/dahdi-tools/%name-%version.tar.bz2 Source1: dahdi.init Source2: dahdi.sysconfig Source10: %{name}.rpmlintrc -Patch1: %{name}-2.3.0-Makefile.patch -Patch2: dahdi-tools-soname.diff +Patch1: dahdi-gcc47.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq -BuildRequires: perl wget -BuildRequires: dahdi-linux-devel -BuildRequires: libpri-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: dahdi-linux-devel +BuildRequires: libpri-devel BuildRequires: libusb-devel BuildRequires: newt-devel +BuildRequires: perl +BuildRequires: wget %if 0%{?suse_version} >= 1130 -BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libxml-2.0) %else -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel %endif -Requires: perl = %{perl_version} +Requires: perl = %perl_version %description This package contains configuration files, header files, and setup @@ -49,17 +52,20 @@ See /usr/share/doc/packages/dahdi/README for a list of supported hardware. -%package -n libtonezone2 -Summary: Dahdi shared libraries +%package -n libtonezone2_0 +Summary: Tone zone database for the Tormenta ISA card +License: LGPL-2.1 Group: Development/Libraries/Other -%description -n libtonezone2 +%description -n libtonezone2_0 This package contains the shared libraries (.so) %package -n libtonezone-devel -Summary: Development files for dahdi +Summary: Development files for libtonezone +License: LGPL-2.1 Group: Development/Libraries/C and C++ -Requires: libtonezone2 = %{version} +Requires: libtonezone2_0 = %version +Provides: dahdi-tools-devel %description -n libtonezone-devel This package contains the header files and libraries necessary for @@ -67,31 +73,39 @@ %prep %setup -q -%patch -P 1 -P 2 -p1 +%patch -P 1 -p1 %build ./bootstrap.sh %configure +make %{?_smp_mflags}; %install b="%buildroot"; +find "$b"; perl -pi -e "s/sitelib/vendorlib/g" xpp/Makefile -%{__make} DESTDIR=%{buildroot} -%makeinstall DESTDIR=%{buildroot} -%{__make} config DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} +make config DESTDIR=%{buildroot} # Install the init script and sysconfig file -%{__install} -D -m0755 %{S:1} %{buildroot}%{_initrddir}/dahdi -%{__ln_s} -f %{_sysconfdir}/init.d/dahdi %{buildroot}%{_sbindir}/rcdahdi -%{__install} -D -m0644 %{S:2} %{buildroot}/var/adm/fillup-templates/sysconfig.dahdi +install -D -m0755 %{S:1} %{buildroot}%{_initrddir}/dahdi +ln -sf %{_sysconfdir}/init.d/dahdi %{buildroot}%{_sbindir}/rcdahdi +install -D -m0644 %{S:2} %{buildroot}/var/adm/fillup-templates/sysconfig.dahdi # remove deprecated files -%{__rm} -rf %{buildroot}%{_sysconfdir}/hotplug +rm -Rf %{buildroot}%{_sysconfdir}/hotplug # The explanation in dahdi-tools/Makefile seems to contradict itself, # so just go with the fact that libtonezone1 is provided by zaptel. rm -f "$b/%_libdir"/libtonezone.so.1; +# No shared library has this SONAME, so delete this stray symlink. +rm -f "$b/%_libdir/libtonezone.so.2"; + +# Nothing in this file. If user wants options, he should define his own +# file that is not tracked by rpm. +rm -f "$b/%_sysconfdir/modprobe.d/dahdi.conf"; + %preun %{stop_on_removal dahdi} @@ -102,12 +116,12 @@ %restart_on_update dahdi %insserv_cleanup -%post -n libtonezone2 -p /sbin/ldconfig +%post -n libtonezone2_0 -p /sbin/ldconfig -%postun -n libtonezone2 -p /sbin/ldconfig +%postun -n libtonezone2_0 -p /sbin/ldconfig %files -%defattr(-,root,root,-) +%defattr(-,root,root) %doc ChangeLog LICENSE README %dir /etc/dahdi %config /etc/dahdi/init.conf @@ -117,8 +131,7 @@ #config /etc/hotplug/usb/xpp_fxloader #config /etc/hotplug/usb/xpp_fxloader.usermap %dir /etc/modprobe.d -%config /etc/modprobe.d/dahdi -%config /etc/modprobe.d/dahdi.blacklist +%config /etc/modprobe.d/dahdi.blacklist.conf /etc/init.d/dahdi /var/adm/fillup-templates/sysconfig.dahdi %{perl_vendorlib}/* @@ -130,12 +143,14 @@ /usr/sbin/twinstar /usr/share/man/man8/twinstar.8.gz -%files -n libtonezone2 +%files -n libtonezone2_0 %defattr(-,root,root,-) -%{_libdir}/libtonezone.so.2* +%{_libdir}/libtonezone.so.2.0* %files -n libtonezone-devel -%defattr(-,root,root,-) +%defattr(-,root,root) %{_includedir}/dahdi/tonezone.h %attr(0644,root,root) %{_libdir}/libtonezone.a %{_libdir}/libtonezone.so + +%changelog
[-] [+]	Added	dahdi-gcc47.diff ^
@@ -0,0 +1,100 @@ +From: Jan Engelhardt <jengelh@inai.de> +Date: 2012-06-25 03:08:51.214248775 +0200 + +You are using NULL, therefore you need stdio.h. That is +non-negotioable. + +--- + xpp/oct612x/apilib/bt/octapi_bt0.c \| 1 + + xpp/oct612x/apilib/llman/octapi_llman.c \| 1 + + xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c \| 1 + + xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c \| 1 + + xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c \| 1 + + xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c \| 1 + + xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c \| 1 + + 7 files changed, 7 insertions(+) + +Index: dahdi-tools-2.6.1/xpp/oct612x/apilib/bt/octapi_bt0.c +=================================================================== +--- dahdi-tools-2.6.1.orig/xpp/oct612x/apilib/bt/octapi_bt0.c ++++ dahdi-tools-2.6.1/xpp/oct612x/apilib/bt/octapi_bt0.c +@@ -28,6 +28,7 @@ $Octasic_Release: OCT612xAPI-01.00-PR49 + $Octasic_Revision: 18 $ + + \--------------------------------------/ ++#include <stdio.h> + #include "apilib/octapi_bt0.h" + #include "octapi_bt0_private.h" + +Index: dahdi-tools-2.6.1/xpp/oct612x/apilib/llman/octapi_llman.c +=================================================================== +--- dahdi-tools-2.6.1.orig/xpp/oct612x/apilib/llman/octapi_llman.c ++++ dahdi-tools-2.6.1/xpp/oct612x/apilib/llman/octapi_llman.c +@@ -29,6 +29,7 @@ $Octasic_Release: OCT612xAPI-01.00-PR49 + $Octasic_Revision: 22 $ + + \--------------------------------------/ ++#include <stdio.h> + #include "octapi_llman_private.h" + #include "apilib/octapi_llman.h" + #include "apilib/octapi_largmath.h" +Index: dahdi-tools-2.6.1/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c +=================================================================== +--- dahdi-tools-2.6.1.orig/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c ++++ dahdi-tools-2.6.1/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c +@@ -34,6 +34,7 @@ $Octasic_Revision: 146 $ + + /*************************** INCLUDE FILES ***************************/ + ++#include <stdio.h> + #include "octdef.h" + + #include "oct6100api/oct6100_defines.h" +Index: dahdi-tools-2.6.1/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c +=================================================================== +--- dahdi-tools-2.6.1.orig/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c ++++ dahdi-tools-2.6.1/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c +@@ -31,6 +31,7 @@ $Octasic_Revision: 81 $ + + /************************* INCLUDE FILES ***************************/ + ++#include <stdio.h> + #include "octdef.h" + + #include "oct6100api/oct6100_defines.h" +Index: dahdi-tools-2.6.1/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c +=================================================================== +--- dahdi-tools-2.6.1.orig/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c ++++ dahdi-tools-2.6.1/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c +@@ -31,6 +31,7 @@ $Octasic_Revision: 35 $ + + /************************* INCLUDE FILES ***************************/ + ++#include <stdio.h> + #include "octdef.h" + + #include "oct6100api/oct6100_defines.h" +Index: dahdi-tools-2.6.1/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c +=================================================================== +--- dahdi-tools-2.6.1.orig/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c ++++ dahdi-tools-2.6.1/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c +@@ -31,6 +31,7 @@ $Octasic_Revision: 109 $ + + /************************* INCLUDE FILES ***************************/ + ++#include <stdio.h> + #include "octdef.h" + + #include "oct6100api/oct6100_defines.h" +Index: dahdi-tools-2.6.1/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c +=================================================================== +--- dahdi-tools-2.6.1.orig/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c ++++ dahdi-tools-2.6.1/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c +@@ -32,6 +32,7 @@ $Octasic_Revision: 39 $ + + /************************* INCLUDE FILES *****************************/ + ++#include <stdio.h> + #include "octdef.h" + + #include "oct6100api/oct6100_defines.h"
	Added	dahdi-tools-2.6.1.tar.bz2 ^