dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-zaptel-1.4.2.1.tar.gz

.gitignore

@@ -0,0 +1 @@
+zaptel-1.4.12.1.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: zaptel
-# $Id$
-NAME := zaptel
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-42ce771a840ec239abfd945923a98b56  zaptel-1.4.2.1.tar.gz
+71e83a020b020fa60905edecf70e95a3  zaptel-1.4.12.1.tar.gz

zaptel-1.4.0-beta1-udevzaptelowner.patch

@@ -1,21 +0,0 @@
-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

zaptel-1.4.1-makefile.patch

@@ -1,29 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile	(revision 2341)
-+++ Makefile	(working copy)
-@@ -386,10 +386,7 @@
- $(UTILSO): %.o: %.c
- 	$(CC) $(CFLAGS) -o $@ -c $<
- 
--install: all devices install-modules install-libs install-include install-xpp
--ifeq ($(HOTPLUG_FIRMWARE),yes)
--	$(MAKE) -C firmware hotplug-install
--endif
-+install: devices install-libs install-include install-xpp
- 	if [ -f ztcfg ]; then \
- 		$(INSTALL) -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg; \
- 	fi
-@@ -403,12 +400,8 @@
- 	fi
- 	$(INSTALL) -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
- 	$(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 	[ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)"
--	@if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
- 
- install-libs: $(LTZ_SO) $(LTZ_A)
- 	$(INSTALL) -D -m 755 $(LTZ_A) $(LIB_DIR)/$(LTZ_A)

zaptel-1.4.10-udevzaptelowner.patch

@@ -0,0 +1,23 @@
+From 32a671bbf9ae1103626d539b4fce7d649d39e11f Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff@ocjtech.us>
+Date: Tue, 15 Jan 2008 08:01:31 -0600
+Subject: [PATCH] Apply udevzaptelowner patch from rpm package.
+
+---
+ build_tools/genudevrules |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/build_tools/genudevrules b/build_tools/genudevrules
+index 17e1f90..fa6987b 100755
+--- a/build_tools/genudevrules
++++ b/build_tools/genudevrules
+@@ -31,5 +31,5 @@ KERNEL${match}"zappseudo", NAME="zap/pseudo"
+ KERNEL${match}"zap[0-9]*", NAME="zap/%n"
+ 
+ # zaptel devices with ownership/permissions for running as non-root
+-SUBSYSTEM${match}"zaptel",  OWNER="asterisk", GROUP="asterisk", MODE="0660"
++SUBSYSTEM${match}"zaptel",  OWNER="zaptel", GROUP="zaptel", MODE="0660"
+ EOF
+-- 
+1.5.4.3
+

zaptel.spec

@@ -1,14 +1,12 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
-Version: 1.4.2.1
+Version: 1.4.12.1
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/System
 URL: http://www.digium.com/
-Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz
-Patch0:  zaptel-1.4.0-beta1-udevzaptelowner.patch
-Patch1:  zaptel-1.4.1-makefile.patch
-
+Source0: http://downloads.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz
+Patch0:  zaptel-1.4.10-udevzaptelowner.patch
 Source1: menuselect.makedeps
 Source2: menuselect.makeopts
 Source3: zaptel.init
@@ -16,6 +14,7 @@ Source3: zaptel.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires: newt-devel
+BuildRequires: udev
 
 Requires(pre): fedora-usermgmt
 
@@ -56,8 +55,7 @@ Development files for Zapata telephony interfaces.
 %prep
 %setup0 -q
 
-%patch0 -p0
-%patch1 -p0
+%patch0 -p1
 
 cp %{S:1} .
 cp %{S:2} .
@@ -90,36 +88,23 @@ 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}/sysconfig/network-scripts
 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}
+make install-programs config DESTDIR=%{buildroot}
 
-for f in fxotune fxstest ztdiag ztmonitor ztspeed zttest zttool
+build_tools/genudevrules > %{buildroot}%{_sysconfdir}/udev/rules.d/zaptel.rules
+
+for f in fxotune fxstest ztdiag ztmonitor ztscan 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
 
-%if %{fedora} <= 5
-rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc
-rm -f %{buildroot}/sbin/sethdlc
-rm -f %{buildroot}/sbin/sethdlc-new
-%endif
-
 %clean
 rm -rf %{buildroot}
 
@@ -143,29 +128,20 @@ fi
 %defattr(-,root,root,-)
 
 %doc ChangeLog
-%if %{fedora} > 5
 %doc ifcfg-hdlc0
-%endif
 %doc LICENSE
 %doc README
 %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
 
-%if %{fedora} > 5
 %{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc
-%endif
 /sbin/ztcfg
-%if %{fedora} > 5
-/sbin/sethdlc
 /sbin/sethdlc-new
-%endif
 
 %{_initrddir}/zaptel
 %{_mandir}/man8/ztcfg.8*
@@ -182,12 +158,16 @@ fi
 %{_sbindir}/fxstest
 %{_sbindir}/ztdiag
 %{_sbindir}/ztmonitor
+%{_sbindir}/ztscan
 %{_sbindir}/ztspeed
 %{_sbindir}/zttest
 %{_sbindir}/zttool
 
 %{_mandir}/man8/fxotune.8*
+%{_mandir}/man8/fxstest.8*
+%{_mandir}/man8/ztdiag.8*
 %{_mandir}/man8/ztmonitor.8*
+%{_mandir}/man8/ztscan.8*
 %{_mandir}/man8/ztspeed.8*
 %{_mandir}/man8/zttest.8*
 %{_mandir}/man8/zttool.8*
@@ -201,6 +181,41 @@ fi
 %{_libdir}/libtonezone.so
 
 %changelog
+* Tue Sep  9 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.12.1-1
+- Update to 1.4.12.1
+
+* Thu Sep  4 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.12-1
+- Update to 1.4.12
+
+* Mon Aug 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.4.11-2
+- Fix license tag.
+
+* Wed May 28 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.11-1
+- Update to 1.4.11
+
+* Thu May  8 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.10.1-1
+- Update to 1.4.10.1
+
+* Wed Apr  9 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.10-1
+- Update to 1.4.10
+
+* Thu Feb 21 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.9-1
+- Update to 1.4.9.
+
+* Mon Feb 11 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.8-2
+- Rebuild for GCC 4.3
+
+* Mon Jan 14 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.8-1
+- Update to 1.4.8
+
+* Thu Dec 20 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.7.1-1
+- Update to 1.4.7.1
+- Drop upstreamed patch.
+
+* Fri Nov  1 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.6-1
+- Update to 1.4.6
+- Apply patch to fix AST-2007-024
+
 * Wed Apr 25 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.2.1-1
 - Update to 1.4.2.1