rpms/zaptel/FC-6 zaptel-1.4.1-makefile.patch, NONE, 1.1 zaptel.spec, 1.7, 1.8 zaptel-1.4.0-beta1-makefile.patch, 1.1, NONE

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/extras/rpms/zaptel/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17845

Modified Files:
	zaptel.spec 
Added Files:
	zaptel-1.4.1-makefile.patch 
Removed Files:
	zaptel-1.4.0-beta1-makefile.patch 
Log Message:
Really, really make this build with out the kernel source...

zaptel-1.4.1-makefile.patch:

--- NEW FILE zaptel-1.4.1-makefile.patch ---
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)


Index: zaptel.spec
===================================================================
RCS file: /cvs/extras/rpms/zaptel/FC-6/zaptel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- zaptel.spec	23 Mar 2007 05:07:33 -0000	1.7
+++ zaptel.spec	24 Mar 2007 04:23:32 -0000	1.8
@@ -1,12 +1,13 @@
 Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
 Name: zaptel
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 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
 
 Source1: menuselect.makedeps
 Source2: menuselect.makeopts
@@ -56,6 +57,7 @@
 %setup0 -q
 
 %patch0 -p0
+%patch1 -p0
 
 cp %{S:1} .
 cp %{S:2} .
@@ -81,7 +83,7 @@
 
 %configure
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} programs
 
 %install
 rm -rf %{buildroot}
@@ -198,6 +200,12 @@
 %{_libdir}/libtonezone.so
 
 %changelog
+* Fri Mar 23 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.1-3
+- Really, really make it work without the kernel sources...
+
+* Fri Mar 23 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.1-2
+- Let's see if we can get this to build without the kernel sources present.
+
 * Fri Mar 23 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.1-1
 - Update to 1.4.1
 


--- zaptel-1.4.0-beta1-makefile.patch DELETED ---