From 5afc7f54124e10f0afef99cdc027f422a4d2f6b0 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Jul 18 2010 18:28:38 +0000 Subject: sync with devel --- diff --git a/.cvsignore b/.cvsignore index 97feaec..8e29275 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,4 @@ -gtkwave-3.2.3.tar.gz +gtkwave-3.3.6.tar.gz +gtkwave-48.png +gtkwave-32.png +gtkwave-16.png diff --git a/gtkwave.desktop b/gtkwave.desktop new file mode 100644 index 0000000..86bb545 --- /dev/null +++ b/gtkwave.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=GTKWave +GenericName=Electronic Waveform Viewer +Comment=Display simulation results +Exec=gtkwave +Icon=gtkwave +Terminal=false +Type=Application +StartupNotify=true +Categories=Utility;GTK;Electronics;Engineering; diff --git a/gtkwave.spec b/gtkwave.spec index d6fee7a..0e32888 100644 --- a/gtkwave.spec +++ b/gtkwave.spec @@ -1,18 +1,30 @@ #global prerel RC5 +# %%posttrans is available from FC-4, EL-5 onwards +%global have_posttrans %(expr 0%{?fedora} '>' 3 '|' 0%{?rhel} '>' 4) + Summary: Waveform Viewer Name: gtkwave -Version: 3.2.3 +Version: 3.3.10 Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist} License: GPLv2+ Group: Applications/Engineering URL: http://gtkwave.sourceforge.net/ Source0: http://gtkwave.sourceforge.net/gtkwave-%{version}%{?prerel}.tar.gz +Source1: gtkwave.desktop +Source2: gtkwave-16.png +Source3: gtkwave-32.png +Source4: gtkwave-48.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf, flex +BuildRequires: gtk2-devel, bzip2-devel, Judy-devel, xz-devel, zlib-devel +BuildRequires: gperf, flex, desktop-file-utils +%if 0%{?fedora} > 1 || 0%{?rhel} > 3 # BR: /usr/include/tcl.h rather than tcl-devel for compatibility with # old releases prior to tcl-devel split -BuildRequires: /usr/include/tcl.h +BuildRequires: /usr/include/tcl.h /usr/include/tk.h +# We need tcl >= 8.4 (FC-2 onwards) +BuildRequires: tcl >= 8.4 +%endif %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog @@ -23,16 +35,9 @@ tools. %setup -q -n gtkwave-%{version}%{?prerel} %{__cp} -p .gtkwaverc gtkwaverc.sample -# Fix permissions in bundled liblzma for debuginfo -%{__chmod} -x src/liblzma/*.[ch] - -# Note that GTKWave is a GUI application but no desktop entry is provided for it. -# This is because the application required at least one mandatory parameter (file -# to view) and cannot be opened in a "no file" mode from a menu. - %build -%{configure} --disable-dependency-tracking -%{__make} %{_smp_mflags} +%{configure} --disable-dependency-tracking --enable-judy +%{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} @@ -41,6 +46,12 @@ tools. pkgdatadir=%{_docdir}/gtkwave-%{version} \ INSTALL="%{__install} -p" +# Icons and desktop entry +/usr/bin/desktop-file-install --vendor "" --dir %{buildroot}%{_datadir}/applications %{SOURCE1} +%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/gtkwave.png +%{__install} -D -m 644 -p %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/gtkwave.png +%{__install} -D -m 644 -p %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/gtkwave.png + # Include extra docs for extradoc in \ gtkwaverc.sample \ @@ -57,6 +68,22 @@ done %clean %{__rm} -rf %{buildroot} +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%if %{have_posttrans} +%posttrans +# Note that icon cache updates are only needed on FC-4, EL-5 and later, and +# %%posttrans is always available on FC-4, EL-5 and later +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%endif + %files %defattr(-,root,root,-) %doc %{_docdir}/gtkwave-%{version}/ @@ -66,12 +93,8 @@ done %{_bindir}/gtkwave %{_bindir}/lxt2miner %{_bindir}/lxt2vcd -%{_bindir}/mvl2lxt -%{_bindir}/mvl2vcd %{_bindir}/rtlbrowse %{_bindir}/shmidcat -%{_bindir}/tex2vcd -%{_bindir}/tla2vcd %{_bindir}/twinwave %{_bindir}/vcd2fst %{_bindir}/vcd2lxt @@ -80,18 +103,18 @@ done %{_bindir}/vermin %{_bindir}/vzt2vcd %{_bindir}/vztminer +%{_datadir}/applications/gtkwave.desktop +%{_datadir}/icons/hicolor/16x16/apps/gtkwave.png +%{_datadir}/icons/hicolor/32x32/apps/gtkwave.png +%{_datadir}/icons/hicolor/48x48/apps/gtkwave.png %{_mandir}/man1/evcd2vcd.1* %{_mandir}/man1/fst2vcd.1* %{_mandir}/man1/ghwdump.1* %{_mandir}/man1/gtkwave.1* %{_mandir}/man1/lxt2miner.1* %{_mandir}/man1/lxt2vcd.1* -%{_mandir}/man1/mvl2lxt.1* -%{_mandir}/man1/mvl2vcd.1* %{_mandir}/man1/rtlbrowse.1* %{_mandir}/man1/shmidcat.1* -%{_mandir}/man1/tex2vcd.1* -%{_mandir}/man1/tla2vcd.1* %{_mandir}/man1/twinwave.1* %{_mandir}/man1/vcd2fst.1* %{_mandir}/man1/vcd2lxt.1* @@ -103,6 +126,65 @@ done %{_mandir}/man5/gtkwaverc.5* %changelog +* Sun Jul 18 2010 Paul Howarth 3.3.10-1 +- update to 3.3.10 + - parallel build fix + - fix free of non-malloc'd address due to context changing in Tcl scripts + - updated vcd2fst so it is compatible with VerilatedVcd writer + - read hierarchy reconstruction hardening in fstapi.c + - check return code for hierarchy generation in fst2vcd.c + - updated example to reflect Quit name change + - updated repscript_timer so it prints stack trace + +* Wed Jul 7 2010 Paul Howarth 3.3.9-1 +- update to 3.3.9 + - changed accelerator for Quit to conform to Gnome guidelines + - fix crash that can occur in RemoveTrace +- disable parallel build for now + +* Sat Jun 26 2010 Paul Howarth 3.3.8-1 +- update to 3.3.8 + - add failure check on tempfile creation in fstReaderInit() + - add strace_repeat_count and an appropriate menu option + - add drag-and-drop of signals from gtkwave into rtlbrowse + - remove the "/File/Quit/Don't Quit" menu item if "fast exit" is enabled + - more warnings cleanups + +* Sun Jun 6 2010 Paul Howarth 3.3.7-1 +- update to 3.3.7 (general bug and compiler warning fixes) +- -n option not needed in desktop file + +* Tue May 4 2010 Paul Howarth 3.3.6-1 +- update to 3.3.6 (see CHANGELOG.TXT for details) +- add desktop file and icons based on Mandriva package +- BR: desktop-file-utils +- add scriptlets to update icon cache +- no longer need to fix permissions of lzma wrapper code + +* Sat Mar 20 2010 Paul Howarth 3.3.5-1 +- update to 3.3.5 (see CHANGELOG.TXT for details) +- add Judy-devel buildreq for improved memory usage efficiency + +* Mon Mar 8 2010 Paul Howarth 3.3.4-1 +- update to 3.3.4 (see CHANGELOG.TXT for details) + +* Fri Feb 19 2010 Paul Howarth 3.3.3-1 +- update to 3.3.3 +- drop upstreamed dlopen linking patch +- drop obsolete helper apps mvl2lxt, mvl2vcd, tex2vcd and tla2vcd + +* Mon Feb 15 2010 Paul Howarth 3.3.2-2 +- fix FTBFS due to missing -ldl linking for dlopen function (#565173) + +* Tue Jan 5 2010 Paul Howarth 3.3.2-1 +- update to 3.3.2 (speed up operation on networked filesystems) + +* Sat Dec 26 2009 Paul Howarth 3.3.0-1 +- update to 3.3.0 +- added tk support +- bundled old liblzma replaced by system xz (add BR: xz-devel) +- tcl/tk support require Fedora >= 2 or RHEL >= 4 (tcl 8.4) + * Fri Sep 4 2009 Paul Howarth 3.2.3-1 - update to 3.2.3 - fix permissions in bundled liblzma for debuginfo diff --git a/sources b/sources index f58eb22..df14794 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ -dcc427903a8f5e958c099f108958dce8 gtkwave-3.2.3.tar.gz +4e5e0a14ca52463fdbc4b69a47b87c6a gtkwave-3.3.10.tar.gz +4fdb2fec2b6d9732e2f111c6cd63b788 gtkwave-48.png +410c50539074403d3a3240f7c9209b11 gtkwave-32.png +2cc7754492918591242bc38a0b11d2a5 gtkwave-16.png