diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/app/Makefile.tpl wfdb-10.4.3/app/Makefile.tpl --- wfdb-10.4.2/app/Makefile.tpl 2006-05-04 14:30:53.000000000 -0400 +++ wfdb-10.4.3/app/Makefile.tpl 2006-05-10 15:13:57.000000000 -0400 @@ -1,5 +1,5 @@ # file: Makefile.tpl G. Moody 23 May 2000 -# Last revised: 4 May 2006 +# Last revised: 5 May 2006 # This section of the Makefile should not need to be changed. CFILES = ann2rr.c bxb.c calsig.c ecgeval.c epicmp.c fir.c ihr.c mfilt.c \ @@ -28,16 +28,15 @@ all: $(XFILES) $(STRIP) $(XFILES) -# `make' or `make install': build and install applications, clean up +# `make' or `make install': build and install applications install: all $(BINDIR) $(PSPDIR) scripts - rm -f pschart psfd + rm -f pschart psfd pschart.exe psfd.exe $(MAKE) pschart psfd # be sure compiled-in paths are up-to-date $(STRIP) pschart psfd $(SETXPERMISSIONS) $(XFILES) ../install.sh $(BINDIR) $(XFILES) cp $(PSFILES) $(PSPDIR) cd $(PSPDIR); $(SETPERMISSIONS) $(PSFILES) - $(MAKE) clean # `make scripts': install customized scripts for setting WFDB path scripts: diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/conf/version.def wfdb-10.4.3/conf/version.def --- wfdb-10.4.2/conf/version.def 2006-05-04 00:30:32.000000000 -0400 +++ wfdb-10.4.3/conf/version.def 2006-05-08 13:10:45.000000000 -0400 @@ -1,10 +1,10 @@ # file: version.def G. Moody 24 May 2000 -# Last revised: 4 May 2006 +# Last revised: 8 May 2006 # Each release of the WFDB Software Package is identified by a three-part # version number, defined here: MAJOR = 10 MINOR = 4 -RELEASE = 2 +RELEASE = 3 VERSION = $(MAJOR).$(MINOR).$(RELEASE) # RPMRELEASE can be incremented if changes are made between official diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/configure wfdb-10.4.3/configure --- wfdb-10.4.2/configure 2005-08-08 07:04:37.000000000 -0400 +++ wfdb-10.4.3/configure 2006-05-10 16:33:39.000000000 -0400 @@ -386,12 +386,11 @@ if [ $LIBTYPE = "static" -a $NETLIB != "none" ] then LL = "$LL $LL $LL" + sed "s/LC =/LC = $LC/" site.tmp + mv site.tmp site.def fi sed "s/LC =/LC = $LC/" site.tmp mv site.tmp site-slib.def -sed "s/LC =/LC = $LC/" site.tmp -mv site.tmp site.def - cd .. echo diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/convert/Makefile.tpl wfdb-10.4.3/convert/Makefile.tpl --- wfdb-10.4.2/convert/Makefile.tpl 2003-02-12 15:19:27.000000000 -0500 +++ wfdb-10.4.3/convert/Makefile.tpl 2006-05-10 15:19:20.000000000 -0400 @@ -18,11 +18,10 @@ all: $(XFILES) $(STRIP) $(XFILES) -# `make' or `make install': build and install applications, clean up +# `make' or `make install': build and install applications install: $(BINDIR) all $(SCRIPTS) $(SETXPERMISSIONS) $(XFILES) $(SCRIPTS) ../install.sh $(BINDIR) $(XFILES) $(SCRIPTS) - $(MAKE) clean uninstall: ../uninstall.sh $(BINDIR) $(XFILES) $(SCRIPTS) diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/doc/wug-src/wug0.tex wfdb-10.4.3/doc/wug-src/wug0.tex --- wfdb-10.4.2/doc/wug-src/wug0.tex 2006-05-04 17:29:11.000000000 -0400 +++ wfdb-10.4.3/doc/wug-src/wug0.tex 2006-05-05 12:59:12.000000000 -0400 @@ -2536,6 +2536,10 @@ to move to a specified location in the record. With this approach, it is not necessary to start a new \WAVE{} process each time. +On most platforms, \WAVE{} can be started automatically if it is not +running already; under MS-Windows, however, you must start \WAVE{} +manually before using it as a browser helper application. + You can set up your browser to view files with the MIME type {\tt appli\-cation/\-x-wavescript} using {\tt wavescript}. Some browsers, including Firefox, Mozilla, and Netscape, also allow you to specify that any diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/lib/Makefile.tpl wfdb-10.4.3/lib/Makefile.tpl --- wfdb-10.4.2/lib/Makefile.tpl 2006-05-04 14:26:09.000000000 -0400 +++ wfdb-10.4.3/lib/Makefile.tpl 2006-05-10 16:35:52.000000000 -0400 @@ -1,5 +1,5 @@ # file: Makefile.tpl G. Moody 24 May 2000 -# Last revised: 4 May 2006 +# Last revised: 5 May 2006 # This section of the Makefile should not need to be changed. INCLUDES = $(INCDIR)/wfdb/wfdb.h $(INCDIR)/wfdb/ecgcodes.h \ @@ -11,7 +11,7 @@ # `make' or `make all': build the WFDB library and wfdb-config all: setup $(OFILES) - rm -f wfdb-config + rm -f wfdb-config wfdb-config.exe $(MAKE) wfdb-config # be sure that compiled-in paths are up-to-date $(BUILDLIB) $(OFILES) $(BUILDLIB_LDFLAGS) @@ -35,8 +35,8 @@ sed "s+DBDIR+$(DBDIR)+" wfdblib.h wfdb-config: - $(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -DCFLAGS='"$(CFLAGS)"' \ - -DLDFLAGS='"$(LDFLAGS)"' -I$(INCDIR) -o $@ wfdb-config.c + $(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -DCFLAGS='"-I$(INCDIR)"' \ + -DLDFLAGS='"-L$(LIBDIR) -lwfdb"' -I$(INCDIR) -o $@ wfdb-config.c # `make clean': also remove previously compiled versions of the library clean: diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/lib/wfdb.h0 wfdb-10.4.3/lib/wfdb.h0 --- wfdb-10.4.2/lib/wfdb.h0 2006-05-04 00:31:00.000000000 -0400 +++ wfdb-10.4.3/lib/wfdb.h0 2006-05-08 13:10:43.000000000 -0400 @@ -1,5 +1,5 @@ /* file: wfdb.h G. Moody 13 June 1983 - Last revised: 4 May 2006 wfdblib 10.4.2 + Last revised: 8 May 2006 wfdblib 10.4.3 WFDB library type, constant, structure, and function interface definitions _______________________________________________________________________________ @@ -33,7 +33,7 @@ /* WFDB library version. */ #define WFDB_MAJOR 10 #define WFDB_MINOR 4 -#define WFDB_RELEASE 2 +#define WFDB_RELEASE 3 #define WFDB_NETFILES 1 /* if 1, library includes code for HTTP, FTP clients */ #define WFDB_NETFILES_LIBCURL 1 diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/NEWS wfdb-10.4.3/NEWS --- wfdb-10.4.2/NEWS 2006-05-04 16:53:57.000000000 -0400 +++ wfdb-10.4.3/NEWS 2006-05-10 17:56:01.000000000 -0400 @@ -1,3 +1,6 @@ +10.4.3: Updated wfdb.spec (used to generate WFDB RPMs) to account for + applications with compiled-in paths. + 10.4.2: Mathias Gruber reported a line in wfdbio.c that used void pointer arithmetic (permitted as an extension by gcc but not allowed by diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/psd/Makefile.tpl wfdb-10.4.3/psd/Makefile.tpl --- wfdb-10.4.2/psd/Makefile.tpl 2006-05-04 14:20:47.000000000 -0400 +++ wfdb-10.4.3/psd/Makefile.tpl 2006-05-10 15:18:23.000000000 -0400 @@ -12,11 +12,10 @@ all: $(XFILES) $(STRIP) $(XFILES) -# `make' or `make install': build and install applications, clean up +# `make' or `make install': build and install applications install: $(BINDIR) all scripts $(SETXPERMISSIONS) $(XFILES) ../install.sh $(BINDIR) $(XFILES) - $(MAKE) clean # `make scripts': customize and install scripts scripts: diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/wave/Makefile.tpl wfdb-10.4.3/wave/Makefile.tpl --- wfdb-10.4.2/wave/Makefile.tpl 2006-05-04 14:16:10.000000000 -0400 +++ wfdb-10.4.3/wave/Makefile.tpl 2006-05-10 16:16:22.000000000 -0400 @@ -1,5 +1,5 @@ # file: Makefile.tpl G. Moody 31 May 2000 -# Last revised: 2 December 2005 +# Last revised: 8 May 2006 # Change the settings below as appropriate for your setup. # Choose directories in which to install WAVE and its ancillary files by @@ -41,7 +41,7 @@ printing.hlp resource.hlp OTHERFILES = wave.hl0 wave.info demo.txt Wave.res wavemenu.def Makefile -all: wave +all: wave wave.hlp news.hlp # `make install': compile and install WAVE and its help files install: $(BINDIR) $(HELPDIR)/wave $(MENUDIR) $(RESDIR) wave.hlp news.hlp @@ -53,7 +53,6 @@ -cp wavemenu.def $(MENUDIR) && \ $(SETPERMISSIONS) $(MENUDIR)/wavemenu.def -cp Wave.res $(RESDIR)/Wave && $(SETPERMISSIONS) $(RESDIR)/Wave - $(MAKE) clean uninstall: ../uninstall.sh $(BINDIR) wave @@ -72,7 +71,7 @@ help: @echo "*************************************************************" @echo "To print the WAVE manual, type 'make manual'." - @echo "If you have a PostScript Printer, you may also wish to print" + @echo "If you have a PostScript printer, you may also wish to print" @echo "the WAVE User's Guide, by typing 'make guide'." @echo "*************************************************************" @echo @@ -83,7 +82,7 @@ @echo @echo "*************************************************************" @echo "To print the WAVE manual, type 'make manual'." - @echo "If you have a PostScript Printer, you may also wish to print" + @echo "If you have a PostScript printer, you may also wish to print" @echo "the WAVE User's Guide, by typing 'make guide'." @echo "*************************************************************" diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/waverc/Makefile.tpl wfdb-10.4.3/waverc/Makefile.tpl --- wfdb-10.4.2/waverc/Makefile.tpl 2006-05-04 14:14:08.000000000 -0400 +++ wfdb-10.4.3/waverc/Makefile.tpl 2006-05-05 13:02:56.000000000 -0400 @@ -1,5 +1,5 @@ # file: Makefile.tpl G. Moody 24 May 2000 -# Last revised: 4 May 2006 +# Last revised: 5 May 2006 # Change the settings below as appropriate for your setup. # `make all' creates wavescript and wave-remote without installing them. @@ -9,10 +9,9 @@ # the WAVE User's Guide for instructions on setting up `wavescript' as a helper # application for your Web browser. install: $(BINDIR) wave-remote - rm -f wavescript + rm -f wavescript wavescript.exe $(MAKE) wavescript # make sure wavescript has the correct BINDIR - $(STRIP) wavescript - $(STRIP) wave-remote + $(STRIP) wavescript wave-remote $(SETXPERMISSIONS) url_view wavescript wave-remote ../install.sh $(BINDIR) url_view wavescript wave-remote diff -Naur --exclude Makefile --exclude info wfdb-10.4.2/wfdb.spec wfdb-10.4.3/wfdb.spec --- wfdb-10.4.2/wfdb.spec 2005-08-03 11:40:03.000000000 -0400 +++ wfdb-10.4.3/wfdb.spec 2006-05-10 17:19:06.000000000 -0400 @@ -1,13 +1,12 @@ # Note that this is NOT a relocatable package -Summary: Waveform Database library +Summary: Waveform Database Software Package Name: wfdb Version: VERSION Release: RPMRELEASE License: GPL Group: Libraries -Source0: http://www.physionet.org/physiotools/archives/wfdb-VERSION.tar.gz -Source1: http://www.physionet.org/physiotools/archives/wfdb-MAJOR.MINOR/wfdb-VERSION.tar.gz +Source: http://www.physionet.org/physiotools/archives/wfdb-VERSION.tar.gz URL: http://www.physionet.org/physiotools/wfdb.shtml Vendor: PhysioNet Packager: George Moody @@ -16,6 +15,9 @@ BuildRoot: /var/tmp/%{name}-root %changelog +* Wed May 10 2006 George B Moody +- rewrote install section to solve problems with compiled-in paths + * Wed Aug 3 2005 George B Moody - added --dynamic to 'configure' argument list @@ -40,32 +42,47 @@ %setup %build -PATH=$PATH:/usr/openwin/bin ./configure --prefix=/usr --dynamic --mandir=%{_mandir} -make - -# The 'make' command above actually *installs* the WFDB library and its *.h -# files in /usr/lib and /usr/include/wfdb/, because it is not possible -# otherwise to compile the apps and link them to the shared WFDB library. As -# far as I can tell, there is no way to avoid this given the way RPM works. - # The 'make' commands below create HTML, PDF, and PostScript versions of the # WFDB Programmer's Guide, WFDB Applications Guide, and WAVE User's Guide. +make clean +PATH=$PATH:/usr/openwin/bin ./configure --prefix=/usr --dynamic --mandir=%{_mandir} cd doc/wpg-src; make cd ../wag-src; make cd ../wug-src; make %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/lib $RPM_BUILD_ROOT/usr/include/wfdb -mkdir -p $RPM_BUILD_ROOT/usr/bin -cd lib; cp -p libwfdb.so* $RPM_BUILD_ROOT/usr/lib - cp -p wfdb.h ecgcodes.h ecgmap.h wfdblib.h $RPM_BUILD_ROOT/usr/include/wfdb - cp -p wfdb-config $RPM_BUILD_ROOT/usr/bin -cd ../wave; make WFDBROOT=$RPM_BUILD_ROOT/usr install -cd ../waverc; make WFDBROOT=$RPM_BUILD_ROOT/usr install -cd ../app; make WFDBROOT=$RPM_BUILD_ROOT/usr install -cd ../psd; make WFDBROOT=$RPM_BUILD_ROOT/usr install -cd ../convert; make WFDBROOT=$RPM_BUILD_ROOT/usr install +mkdir -p $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT/usr/help +mkdir -p $RPM_BUILD_ROOT/usr/lib/ps $RPM_BUILD_ROOT/usr/include/wfdb +mkdir -p $RPM_BUILD_ROOT/usr/lib/X11/app-defaults +make install +cd lib + cp -p libwfdb.so* $RPM_BUILD_ROOT/usr/lib + cp -p wfdb.h ecgcodes.h ecgmap.h wfdblib.h $RPM_BUILD_ROOT/usr/include/wfdb + cp -p wfdb-config $RPM_BUILD_ROOT/usr/bin +cd ../wave + cp -p wave $RPM_BUILD_ROOT/usr/bin + cp -p *.hlp wave.info demo.txt $RPM_BUILD_ROOT/usr/help + cp -p wavemenu.def $RPM_BUILD_ROOT/usr/lib + cp -p Wave.res $RPM_BUILD_ROOT/usr/lib/X11/app-defaults/Wave +cd ../waverc; + cp -p wavescript wave-remote url_view $RPM_BUILD_ROOT/usr/bin +cd ../app; + cp -p ann2rr bxb calsig ecgeval epicmp fir ihr mfilt \ + mrgann mxm nguess nst plotstm pscgen pschart psfd rdann \ + rdsamp rr2ann rxr sampfreq sigamp sigavg skewedit \ + snip sortann sqrs sqrs125 sumann sumstats tach time2sec \ + wabp wfdbcat wfdbcollate wfdbdesc wfdbwhich wqrs \ + wrann wrsamp xform $RPM_BUILD_ROOT/usr/bin + make scripts; cp -p /usr/bin/setwfdb /usr/bin/cshsetwfdb $RPM_BUILD_ROOT/usr/bin + cp -p *.pro $RPM_BUILD_ROOT/usr/lib/ps +cd ../psd; + cp -p coherence fft log10 lomb memse $RPM_BUILD_ROOT/usr/bin + make scripts; cp -p /usr/bin/hrfft /usr/bin/hrlomb /usr/bin/hrmem \ + /usr/bin/hrplot /usr/bin/plot2d /usr/bin/plot3d $RPM_BUILD_ROOT/usr/bin +cd ../convert; + cp -p a2m ad2m m2a md2a readid makeid edf2mit mit2edf wav2mit mit2wav \ + revise ahaconvert $RPM_BUILD_ROOT/usr/bin cd ../data; make WFDBROOT=$RPM_BUILD_ROOT/usr install cd ../doc; make WFDBROOT=$RPM_BUILD_ROOT/usr install @@ -74,10 +91,12 @@ make clean %post -/sbin/ldconfig -test -e /usr/lib/libwfdb.so.10 -a ! -e /usr/lib/libwfdb.so && ln -sf /usr/lib/libwfdb.so.10 /usr/lib/libwfdb.so +/sbin/ldconfig || \ + ( test -e /usr/lib/libwfdb.so.10 -a ! -e /usr/lib/libwfdb.so && \ + ln -sf /usr/lib/libwfdb.so.10 /usr/lib/libwfdb.so ) -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig || true # ---- wfdb [shared library] package ------------------------------------------