diff --git a/gtkwave-3.3.32-old-gtk.patch b/gtkwave-3.3.32-old-gtk.patch deleted file mode 100644 index 99172f6..0000000 --- a/gtkwave-3.3.32-old-gtk.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- gtkwave-3.3.32/src/renderopt.c -+++ gtkwave-3.3.32/src/renderopt.c -@@ -15,7 +15,9 @@ - #include - - #ifdef WAVE_GTK_UNIX_PRINT -+#if GTK_CHECK_VERSION(2,14,0) - #include -+#endif - #include - #endif - diff --git a/gtkwave.spec b/gtkwave.spec index 04c176a..7307fd3 100644 --- a/gtkwave.spec +++ b/gtkwave.spec @@ -3,12 +3,9 @@ # %%posttrans is available from FC-4, EL-5 onwards %global have_posttrans %(expr 0%{?fedora} '>' 3 '|' 0%{?rhel} '>' 4) -# tcl 8.4 or above only available from F-2/RHEL-5 -%global have_tcl84 %(expr 0%{?fedora} '>' 1 '|' 0%{?rhel} '>' 3) - Summary: Waveform Viewer Name: gtkwave -Version: 3.3.32 +Version: 3.3.33 Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist} License: GPLv2+ Group: Applications/Engineering @@ -18,26 +15,17 @@ Source1: gtkwave.desktop Source2: gtkwave-16.png Source3: gtkwave-32.png Source4: gtkwave-48.png -Patch0: gtkwave-3.3.32-old-gtk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildRequires: gtk2-devel, bzip2-devel, Judy-devel, xz-devel, zlib-devel BuildRequires: gperf, flex, desktop-file-utils -%if %{have_tcl84} # BR: /usr/include/tcl.h rather than tcl-devel for compatibility with # old releases prior to tcl-devel split -BuildRequires: /usr/include/tcl.h /usr/include/tk.h -# We need tcl ≥ 8.4 (FC-2 onwards) BuildRequires: tcl >= 8.4 -%endif +BuildRequires: /usr/include/tcl.h /usr/include/tk.h # These scriptlet requirements are only needed prior to F-5/RHEL-5, -# and shared-mime-info is only available from F-2/RHEL-4 %if 0%{?fedora} < 5 && 0%{?rhel} < 5 -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -%endif -%if %{have_tcl84} && 0%{?fedora} < 5 && 0%{?rhel} < 5 -Requires(post): shared-mime-info -Requires(postun): shared-mime-info +Requires(post): desktop-file-utils, shared-mime-info +Requires(postun): desktop-file-utils, shared-mime-info %endif %description @@ -48,16 +36,10 @@ tools. %prep %setup -q -n gtkwave-%{version}%{?prerel} -# Fix for builds with gtk2 < 2.14, which don't have gtk/gtkunixprint.h -%patch0 -p1 - %build %{configure} \ --disable-dependency-tracking \ --disable-mime-update \ -%if ! %{have_tcl84} - --disable-tcl \ -%endif --enable-judy make %{?_smp_mflags} @@ -205,6 +187,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/gtkwaverc.5* %changelog +* Sun Mar 4 2012 Paul Howarth 3.3.33-1 +- update to 3.3.33 + - scan-build fix in vcd_recoder.c + - added $timezero tag to VCD files, which allows offsetting all the values + in a trace to provide ability for negative time values (currently only VCD, + LXT, LXT2, VZT, and FST support this) + - fix for timescale 10s and 100s +- drop patch for builing with gtk2 2.10.0 to 2.14.0, no longer needed +- drop support for distributions prior to FC-3: + - unconditionally build with tcl support + * Sat Feb 18 2012 Paul Howarth 3.3.32-1 - update to 3.3.32 - turn off loader messages when Tcl is executing a command diff --git a/sources b/sources index c9cab3c..753e76f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -716bba48c1898e39c81b43118e192ac3 gtkwave-3.3.32.tar.gz +18a8acc803814d4873fd342bc70b6b8a gtkwave-3.3.33.tar.gz 2cc7754492918591242bc38a0b11d2a5 gtkwave-16.png 410c50539074403d3a3240f7c9209b11 gtkwave-32.png 4fdb2fec2b6d9732e2f111c6cd63b788 gtkwave-48.png