Changes - j0ke.net Open Build Service

Changes of Revision 11

[-] [+]	Changed	dahdi-linux.spec
@@ -1,5 +1,5 @@ # -# spec file for package dahdi-linux (Version 2.1.0.4) +# spec file for package dahdi-linux (Version 2.2.0.2) # # @@ -10,8 +10,8 @@ BuildRequires: kernel-source kernel-syms udev newt-devel wget module-init-tools URL: http://www.asterisk.org Summary: Tools for the Zapata Telephony Interface Driver -Version: 2.1.0.4 -Release: 16 +Version: 2.2.0.2 +Release: 1 License: GNU General Public License (GPL) Group: Productivity/Telephony/Utilities PreReq: %insserv_prereq %fillup_prereq udev @@ -22,7 +22,7 @@ Source0: http://ftp.digium.com/pub/dahdi/dahdi-linux-%{version}.tar.bz2 Source1: preamble Source2: firmware.tar.bz2 -Patch0: dahdi.patch +Patch0: dahdi-%{version}.patch Patch1: dahdi-driver.patch %suse_kernel_module_package -p %_sourcedir/preamble kdump um iseries64 ppc64 debug xen @@ -148,6 +148,9 @@ /usr/include/dahdi/* %changelog -n dahdi-linux +* Tue Aug 11 2009 Carsten Schoene <cs@linux-administrator.com> - 2.2.0.2-1 +- update to release 2.2.0.2 + * Tue Feb 24 2009 Carsten Schoene <cs@linux-administrator.com> - update to release 2.1.0.4 * Thu Dec 25 2008 Carsten Schoene <cs@linux-administrator.com>
[-] [+]	Added	dahdi-2.2.0.2.patch ^
@@ -0,0 +1,88 @@ +--- Makefile.orig 2009-05-12 23:57:44.000000000 +0200 ++++ Makefile 2009-08-11 20:34:37.000000000 +0200 +@@ -115,7 +115,7 @@ + + install-firmware: + ifeq ($(HOTPLUG_FIRMWARE),yes) +- $(MAKE) -C drivers/dahdi/firmware hotplug-install DESTDIR=$(DESTDIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) ++ $(MAKE) -C drivers/dahdi/firmware hotplug-install DESTDIR=$(DESTDIR) LIBDIR=$(LIBDIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) + endif + + uninstall-firmware: +--- drivers/dahdi/firmware/Makefile.orig 2009-04-29 19:48:39.000000000 +0200 ++++ drivers/dahdi/firmware/Makefile 2009-08-11 20:43:09.000000000 +0200 +@@ -64,7 +64,7 @@ + + # Download and extract firmware tarballs + dahdi-fw-%.tar.gz: +- @if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) \|\| ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.$(subst .tar.gz,,$) ] ) \|\| ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.$(subst .tar.gz,,$) ] ); then \ ++ @if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) \|\| ( [ -d $(DESTDIR)/$(LIBDIR)/hotplug/firmware ] && ! [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.$(subst .tar.gz,,$) ] ) \|\| ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.$(subst .tar.gz,,$) ] ); then \ + echo "Attempting to download $@"; \ + if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; \ + if test ! -f $@; then exit 1; fi; \ +@@ -82,38 +82,38 @@ + # Create object files suitable for linking against + object-build: $(FIRMWARE) $(OBJECT_FILES) + +-$(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware: ++$(DESTDIR)/$(LIBDIR)/hotplug/firmware $(DESTDIR)/lib/firmware: + mkdir -p $@ + + # Install all downloaded firmware images for hotplug usage +-hotplug-install: $(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware $(FIRMWARE) +-ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) ++hotplug-install: $(DESTDIR)$(LIBDIR)/hotplug/firmware $(DESTDIR)/lib/firmware $(FIRMWARE) ++ifeq ($(shell if ( [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) + @echo "Installing dahdi-fw-oct6114-064.bin to hotplug firmware directories" +- @install -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/usr/lib/hotplug/firmware +- @rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-* +- @touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ++ @install -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/$(LIBDIR)/hotplug/firmware ++ @rm -rf $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-064-* ++ @touch $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) + @install -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/lib/firmware + @rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-* + @touch $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) + else + @echo "Firmware dahdi-fw-oct6114-064.bin is already installed with required version $(OCT6114_064_VERSION)" + endif +-ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) ++ifeq ($(shell if ( [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) + @echo "Installing dahdi-fw-oct6114-128.bin to hotplug firmware directories" +- @install -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/usr/lib/hotplug/firmware +- @rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-* +- @touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ++ @install -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/$(LIBDIR)/hotplug/firmware ++ @rm -rf $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-128-* ++ @touch $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) + @install -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/lib/firmware + @rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-* + @touch $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) + else + @echo "Firmware dahdi-fw-oct6114-128.bin is already installed with required version $(OCT6114_128_VERSION)" + endif +-ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) ++ifeq ($(shell if ( [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) + @echo "Installing dahdi-fw-tc400m.bin to hotplug firmware directories" +- @install -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware +- @rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-* +- @touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ++ @install -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/$(LIBDIR)/hotplug/firmware ++ @rm -rf $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-tc400m-* ++ @touch $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) + @install -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/lib/firmware + @rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-* + @touch $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) +@@ -123,9 +123,9 @@ + + # Uninstall any installed dahdi firmware images from hotplug firmware directories + hotplug-uninstall: +- if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ +- rm -f $(DESTDIR)/usr/lib/hotplug/firmware/dahdi-fw-.bin; \ +- rm -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw; \ ++ if [ -d $(DESTDIR)/$(LIBDIR)/hotplug/firmware ]; then \ ++ rm -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/dahdi-fw-.bin; \ ++ rm -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw; \ + fi + if [ -d $(DESTDIR)/lib/firmware ]; then \ + rm -f $(DESTDIR)/lib/firmware/dahdi-fw-*.bin; \
	Added	dahdi-linux-2.2.0.2.tar.bz2 ^