rpms/zaptel/devel menuselect.makedeps, NONE, 1.1 menuselect.makeopts, NONE, 1.1 zaptel-1.4.0-beta1-makefile.patch, NONE, 1.1 zaptel-1.4.0-beta1-udevzaptelowner.patch, NONE, 1.1 zaptel.init, NONE, 1.1 zaptel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Jeffrey C. Ollie (jcollie) fedora-extras-commits at redhat.com
Mon Oct 16 11:53:37 UTC 2006 

Author: jcollie

Update of /cvs/extras/rpms/zaptel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13087/devel

Modified Files:
	.cvsignore sources 
Added Files:
	menuselect.makedeps menuselect.makeopts 
	zaptel-1.4.0-beta1-makefile.patch 
	zaptel-1.4.0-beta1-udevzaptelowner.patch zaptel.init 
	zaptel.spec 
Log Message:
auto-import zaptel-1.4.0-2.beta1 on branch devel from zaptel-1.4.0-2.beta1.src.rpm


--- NEW FILE menuselect.makedeps ---
MENUSELECT_DEPENDS_zttool=LIBNEWT 


--- NEW FILE menuselect.makeopts ---
MENUSELECT_MODULES=pciradio tor2 torisa wcfxo wct1xxp wct4xxp wctdm wctdm24xxp wcte11xp wcusb xpp_usb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode 
MENUSELECT_UTILS=sethdlc-new

zaptel-1.4.0-beta1-makefile.patch:

--- NEW FILE zaptel-1.4.0-beta1-makefile.patch ---
--- Makefile.orig	2006-10-11 20:26:26.000000000 -0500
+++ Makefile	2006-10-11 20:26:41.000000000 -0500
@@ -409,7 +409,7 @@
 		$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER)
 	$(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
 		$(LIB_DIR)/$(LTZ_SO)
-	if [ -z "$(INSTALL_PREFIX)" && -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(LIB_DIR)/$(LTZ_SO); fi
+	if [ -z "$(INSTALL_PREFIX)" -a -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled" ) ; then restorecon -v $(LIB_DIR)/$(LTZ_SO); fi
 
 install-include:
 	$(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel/zaptel.h

zaptel-1.4.0-beta1-udevzaptelowner.patch:

--- NEW FILE zaptel-1.4.0-beta1-udevzaptelowner.patch ---
Index: build_tools/genudevrules
===================================================================
--- build_tools/genudevrules	(revision 1503)
+++ build_tools/genudevrules	(working copy)
@@ -22,10 +22,10 @@
 
 cat <<EOF
 # zaptel devices with ownership/permissions for running as non-root
-KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="zaptel", GROUP="zaptel", MODE="0660"
+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="zaptel", GROUP="zaptel", MODE="0660"
 EOF


--- NEW FILE zaptel.init ---
#!/bin/sh
#
# zaptel        This shell script takes care of loading and unloading \
#               Zapata Telephony interfaces
# chkconfig: - 9 92
# description: The zapata telephony drivers allow you to use your linux \
# computer to accept incoming data and voice interfaces
#
# config: /etc/sysconfig/zaptel

initdir=/etc/rc.d/init.d

# Source function library.
. $initdir/functions || exit 0

# Source zaptel configuration.
[ -f /etc/sysconfig/zaptel ] && . /etc/sysconfig/zaptel

# Check that telephony is up.
[ "${TELEPHONY}" = "yes" ] || exit 0

[ -f /sbin/ztcfg ] || exit 0

[ -f /etc/zaptel.conf ] || exit 0

RETVAL=0

# See how we were called.
case "$1" in
    start)
	if [ ! -e /proc/zaptel/1 ]; then
		echo "No functioning zap hardware found in /proc/zaptel, loading ztdummy"
		action "Loading ztdummy:" modprobe ztdummy
	fi
	action "Running ztcfg: " /sbin/ztcfg
	RETVAL=$?

        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zaptel
        ;;
  stop)
	RETVAL=0

        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zaptel
        ;;
  restart)
	$0 stop
	$0 start
	;;
  reload)
	action "Reloading ztcfg: " /sbin/ztcfg
	RETVAL=$?
	;;
  status)
	echo "Status option unimplemented."
	RETVAL=$?
	;;
  *)
        echo "Usage: zaptel {start|stop|status|restart|reload}"
        exit 1
esac

exit $RETVAL



--- NEW FILE zaptel.spec ---
Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
Name: zaptel
Version: 1.4.0
Release: 2%{?dist}.beta1
License: GPL
Group: Applications/System
URL: http://www.digium.com/
Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta1.tar.gz
Patch0:  zaptel-1.4.0-beta1-udevzaptelowner.patch
Patch1:  zaptel-1.4.0-beta1-makefile.patch

Source1: menuselect.makedeps
Source2: menuselect.makeopts
Source3: zaptel.init

BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)

BuildRequires: newt-devel

Requires(pre): fedora-usermgmt

Requires(preun): /sbin/service
Requires(preun): /sbin/chkconfig

Requires(post): /sbin/chkconfig

Requires(postun): fedora-usermgmt

%description
Tools and libraries for using/configuring/monitoring Zapata telephony
interfaces.

%package lib
Summary:Library for using Zapata telephony interfaces
Group: Development/Libraries

%description lib
Library for using Zapata telephony interfaces.

%package utils
Summary: Tools for monitoring and testing Zapata telephony interfaces
Group: Development/Libraries
Requires: zaptel-lib = %{version}-%{release}

%description utils
Tools for monitoring and testing Zapata telephony interfaces.

%package devel
Summary: Development files for Zapata telephony interfaces
Group: Development/Libraries
Requires: zaptel-lib = %{version}-%{release}

%description devel
Development files for Zapata telephony interfaces.

%prep
%setup0 -q -n zaptel-%{version}-beta1

%patch0 -p0
%patch1 -p0

cp %{S:1} .
cp %{S:2} .
cp %{S:3} .

# convert some files to UTF-8
pushd doc
for f in zttool.8 ztcfg.8 ztmonitor.8
do
  iconv -f iso8859-1 -t utf-8 $f -o $f.tmp
  mv $f.tmp $f
done
popd

%build
pushd menuselect/mxml
%configure
popd

pushd menuselect
%configure
popd

%configure

make %{?_smp_mflags}

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_initrddir}
mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
mkdir -p %{buildroot}%{_sysconfdir}/udev/permissions.d
mkdir -p %{buildroot}%{_mandir}/man8
#mkdir -p %{buildroot}/lib/firmware

make install DYNFS=yes DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot} LIB_DIR=%{buildroot}%{_libdir}
make config DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot}  LIB_DIR=%{buildroot}%{_libdir}
make install-programs DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot}  LIB_DIR=%{buildroot}%{_libdir}

for f in fxotune fxstest ztdiag ztmonitor ztspeed zttest zttool
do
  mv %{buildroot}/sbin/$f %{buildroot}%{_sbindir}/$f
done

cp doc/fxotune.8 %{buildroot}%{_mandir}/man8
cp doc/ztmonitor.8 %{buildroot}%{_mandir}/man8
cp doc/ztspeed.8 %{buildroot}%{_mandir}/man8
cp doc/zttest.8 %{buildroot}%{_mandir}/man8

rm -f %{buildroot}%{_libdir}/libtonezone.a

%clean
rm -rf %{buildroot}

%post 
/usr/sbin/fedora-groupadd 29 -r zaptel &>/dev/null || :
/usr/sbin/fedora-useradd  29 -r -s /sbin/nologin -d / -M          \
                               -c 'Zapata Telephony' -g zaptel zaptel &>/dev/null || :
/sbin/chkconfig --add zaptel

%preun
if [ $1 -eq 0 ]; then
    /sbin/service zaptel stop >/dev/null 2>&1
    /sbin/chkconfig --del zaptel
fi

%post lib -p /sbin/ldconfig

%postun lib -p /sbin/ldconfig

%files
%defattr(-,root,root,-)

%doc ChangeLog
%doc LICENSE
%doc README
%doc README.Astribank
%doc README.b410p
%doc README.fxotune
%doc README.fxsusb
%doc README.Linux26
%doc zaptel.conf.sample

%config(noreplace) %{_sysconfdir}/zaptel.conf
%config(noreplace) %{_sysconfdir}/sysconfig/zaptel
%config(noreplace) %{_sysconfdir}/modprobe.d/zaptel
%config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules

/sbin/ztcfg

%{_initrddir}/zaptel
%{_mandir}/man8/ztcfg.8*

%files lib
%defattr(-,root,root,-)
%{_libdir}/libtonezone.so.1
%{_libdir}/libtonezone.so.1.0

%files utils
%defattr(-,root,root,-)

%{_sbindir}/fxotune
%{_sbindir}/fxstest
%{_sbindir}/ztdiag
%{_sbindir}/ztmonitor
%{_sbindir}/ztspeed
%{_sbindir}/zttest
%{_sbindir}/zttool

%{_mandir}/man8/fxotune.8*
%{_mandir}/man8/ztmonitor.8*
%{_mandir}/man8/ztspeed.8*
%{_mandir}/man8/zttest.8*
%{_mandir}/man8/zttool.8*

%files devel
%defattr(-,root,root,-)
%doc LICENSE
%{_includedir}/zaptel/tonezone.h
%{_includedir}/zaptel/zaptel.h
%{_libdir}/libtonezone.so

%changelog
* Sun Oct 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-2.beta1
- Don't package firmware until license can be figured out.

* Fri Oct 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-1.beta1
- Remove "Provides: zaptel-kmod-common"
- Don't load modules in initscript (except for possibly ztdummy) - leave that up to udev/hotplug.
- Drop ifup-hdlc - it requires sethdlc which isn't available.
- Move utilities to %%{_sbindir} rather than /sbin.
- Split libtonezone off into a separate lib package.
- Use 'zaptel' user/group to own device files.
- Add patch to fix minor makefile bug.

* Wed Oct 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.0-0.beta1
- Update to 1.4.0-beta1

* Fri Jun  9 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.6-3
- Bump release and rebuild.

* Thu Apr 27 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.5-2
- Changed ownership of device nodes to "root" in udev rules file.
- Don't build sethdlc.

* Mon Mar 27 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.5-1
- Update to 1.2.5

* Wed Feb 15 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.4-1
- Update to 1.2.4

* Tue Jan 31 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.3-1
- Preserve timestamps when we install.
- Use custom init.d file that does all the fancy RH stuff.

* Mon Jan 30 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.3-1
- Update to 1.2.3.

* Mon Jan 23 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.2-3
- provide zaptel-kmod-common

* Wed Jan 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.2-2
- Bump release number.

* Wed Jan 18 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.2-1
- Update to 1.2.2.

* Fri Jan 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-2
- Devel subpackage needs to require main package.

* Wed Jan 11 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.1-1
- Initial version for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Oct 2006 11:52:12 -0000	1.1
+++ .cvsignore	16 Oct 2006 11:53:07 -0000	1.2
@@ -0,0 +1 @@
+zaptel-1.4.0-beta1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zaptel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Oct 2006 11:52:12 -0000	1.1
+++ sources	16 Oct 2006 11:53:07 -0000	1.2
@@ -0,0 +1 @@
+6d2bae038c85770fd09a323f192cd682  zaptel-1.4.0-beta1.tar.gz

More information about the scm-commits mailing list