- use new sox options, because it dropped the obsolete -s and -2 options
- fix link errors from re-defined inline functions
- run format_spec_file
old: hamradio/multimon
new: home:bmwiedemann:branches:hamradio/multimon rev None
Index: multimon-sox.diff
===================================================================
--- multimon-sox.diff (revision 9)
+++ multimon-sox.diff (revision 5)
@@ -6,7 +6,7 @@
  			close(pipedes[0]); /* close reading pipe end */
  			execlp("sox", "sox", 
 -			       "-t", "raw",  "-s", "-w", "-r", srate, "-",
-+			       "-t", "raw",  "-s", "-2", "-r", srate, "-",
++			       "-t", "raw",  "-e", "signed-integer", "-b", "16", "-r", srate, "-",
  			       "-t", type, fname,
  			       NULL);
  			perror("execlp");
@@ -18,7 +18,7 @@
  			execlp("sox", "sox", 
  			       "-t", type, fname,
 -			       "-t", "raw", "-s", "-w", "-r", srate, "-",
-+			       "-t", "raw", "-s", "-2", "-r", srate, "-",
++			       "-t", "raw", "-e", "signed-integer", "-b", "16", "-r", srate, "-",
  			       NULL);
  			perror("execlp");
  			exit(10);
Index: multimon.spec
===================================================================
--- multimon.spec (revision 9)
+++ multimon.spec (revision 5)
@@ -1,32 +1,35 @@
 #
-# spec file for package multimon (Version 971208)
+# spec file for package multimon
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
 
-# norootforbuild
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
-#BuildRequires: aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libgcc libnscd libstdc++ libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed strace syslog-ng sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel autoconf automake binutils expat fontconfig fontconfig-devel gcc gdbm gettext libtool perl rpm xorg-x11 xorg-x11-devel xorg-x11-libs
-BuildRequires: xorg-x11-devel
 
-Name:         multimon
-License:      GPL
-Group:        Productivity/Hamradio/Other
-Autoreqprov:  on
-Version:      971208
-Release:      955
-Summary:      Linux Radio Transmission Decoder
-Source:       http://www.ife.ee.ethz.ch/~sailer/ham/linux/multimon.tar.gz
-Patch:        multimon.dif
-Patch1:       multimon-sox.diff
-Patch2:       multimon-missing-include.diff
-URL:          http://www.baycom.org/~tom/ham/linux/multimon.html
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Requires:     sox
+Name:           multimon
+Version:        971208
+Release:        0
+Summary:        Linux Radio Transmission Decoder
+License:        GPL-2.0+
+Group:          Productivity/Hamradio/Other
+Source:         http://www.ife.ee.ethz.ch/~sailer/ham/linux/multimon.tar.gz
+Patch:          multimon.dif
+Patch1:         multimon-sox.diff
+Patch2:         multimon-missing-include.diff
+Url:            http://www.baycom.org/~tom/ham/linux/multimon.html
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  xorg-x11-devel
+Requires:       sox
 
 %description
 The multimon software can decode a variety of digital transmission
@@ -40,12 +43,13 @@
 --------
     Thomas Sailer <sailer@ife.ee.ethz.ch>
 
-%debug_package
 %prep
 %setup -n multimon
 %patch
 %patch1 -p1
 %patch2 -p1
+# fix link errors from re-defined inline functions
+sed -i 's/extern inline/static inline/' *.h
 
 %build
 %ifarch %ix86
@@ -67,35 +71,4 @@
 %doc multimon.html
 /usr/bin/*
 
-%changelog -n multimoni
-* Thu Feb 09 2012 - bwiedemann@suse.de
-- add Requires: sox (mandatory for format conversion)
-* Tue Feb 22 2011 - dl8fcl@darc.de
-- fix for 11.4
-* Sun Jan 11 2004 - adrian@suse.de
-- add %%defattr
-* Fri Jul 05 2002 - kukuk@suse.de
-- Use %%ix86 macro
-* Mon Jun 03 2002 - ro@suse.de
-- fix for lib64 platforms
-* Thu Apr 12 2001 - uli@suse.de
-- use RPM_OPT_FLAGS (fixes 390)
-* Thu Nov 30 2000 - jreuter@suse.de
-- changed group to Applications/Hamradio
-* Fri May 19 2000 - bubnikv@suse.cz
-- added buildroot, URL; spec file cleanup
-- removed mktab binary; is used only by compilation process
-* Tue Dec 07 1999 - kukuk@suse.de
-- Fix for SPARC
-* Mon Sep 13 1999 - bs@suse.de
-- ran old prepare_spec on spec file to switch to new prepare_spec.
-* Fri Sep 10 1999 - uli@suse.de
-- fixed Makefile/spec for PPC
-* Thu Jul 08 1999 - ka@suse.de
-- fixed error in specfile
-* Thu May 20 1999 - uli@suse.de
-- builds on x86 boxes with x != 6
-* Thu May 20 1999 - ro@suse.de
-- no m486 et.al on alpha
-* Fri Apr 09 1999 - ka@suse.de
-- initial release
+%changelog
Index: multimon.changes
===================================================================
--- multimon.changes (added)
+++ multimon.changes (revision 5)
@@ -0,0 +1,40 @@
+-------------------------------------------------------------------
+Fri Nov 20 10:56:58 UTC 2015 - bwiedemann@suse.com
+
+- use new sox options, because it dropped the obsolete -s and -2 options
+- fix link errors from re-defined inline functions
+- run format_spec_file
+
+-------------------------------------------------------------------
+Thu Feb 09 00:00:00 UTC 2012 - bwiedemann@suse.com
+
+- add Requires: sox (mandatory for format conversion)
+* Tue Feb 22 2011 - dl8fcl@darc.de
+- fix for 11.4
+* Sun Jan 11 2004 - adrian@suse.de
+- add %%defattr
+* Fri Jul 05 2002 - kukuk@suse.de
+- Use %%ix86 macro
+* Mon Jun 03 2002 - ro@suse.de
+- fix for lib64 platforms
+* Thu Apr 12 2001 - uli@suse.de
+- use RPM_OPT_FLAGS (fixes 390)
+* Thu Nov 30 2000 - jreuter@suse.de
+- changed group to Applications/Hamradio
+* Fri May 19 2000 - bubnikv@suse.cz
+- added buildroot, URL; spec file cleanup
+- removed mktab binary; is used only by compilation process
+* Tue Dec 07 1999 - kukuk@suse.de
+- Fix for SPARC
+* Mon Sep 13 1999 - bs@suse.de
+- ran old prepare_spec on spec file to switch to new prepare_spec.
+* Fri Sep 10 1999 - uli@suse.de
+- fixed Makefile/spec for PPC
+* Thu Jul 08 1999 - ka@suse.de
+- fixed error in specfile
+* Thu May 20 1999 - uli@suse.de
+- builds on x86 boxes with x != 6
+* Thu May 20 1999 - ro@suse.de
+- no m486 et.al on alpha
+* Fri Apr 09 1999 - ka@suse.de
+- initial release

• Files Changed
• Browse Source