[gtkwave] Update to 3.3.29

Paul Howarth pghmcfc at fedoraproject.org
Fri Jan 6 10:56:29 UTC 2012 

commit 00e94bf7d3f42ab1ab08ad79cec83b99ce42bf6b
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Jan 6 10:55:19 2012 +0000

    Update to 3.3.29
    
    - New upstream release 3.3.29
      - Added OSX integration when compiled against gtk-osx
      - Added mime types and icons for file types and desktop menus
      - Changed .sav (deprecated but not removed) to .gtkw, with .gtkw itself being
        able to bring up the original dumpfile
      - Numerous bug fixes
      - Preliminary GConf support supporting session ID-based restore
      - Preliminary GConf support to emulate OSX "open" functionality such that
        dumpfiles/savefiles can be targeted to an open gtkwave viewer/session ID
    - Drop upstreamed array size patch
    - Add scriptlet snippets for new desktop functionality

 gtkwave-3.3.28-array-size.patch |   11 ----
 gtkwave.desktop                 |    1 +
 gtkwave.spec                    |  102 +++++++++++++++++++++++++++++++++++----
 sources                         |    2 +-
 4 files changed, 95 insertions(+), 21 deletions(-)
---
diff --git a/gtkwave.desktop b/gtkwave.desktop
index 86bb545..6801256 100644
--- a/gtkwave.desktop
+++ b/gtkwave.desktop
@@ -9,3 +9,4 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=Utility;GTK;Electronics;Engineering;
+MimeType=application/vnd.gtkwave-ae2;application/vnd.gtkwave-aet;application/vnd.gtkwave-evcd;application/vnd.gtkwave-fst;application/vnd.gtkwave-ghw;application/vnd.gtkwave-gtkw;application/vnd.gtkwave-lx2;application/vnd.gtkwave-lxt2;application/vnd.gtkwave-lxt;application/vnd.gtkwave-vcd;application/vnd.gtkwave-vzt;
diff --git a/gtkwave.spec b/gtkwave.spec
index b2cb466..162f1d7 100644
--- a/gtkwave.spec
+++ b/gtkwave.spec
@@ -3,9 +3,12 @@
 # %%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.28
+Version:	3.3.29
 Release:	%{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
@@ -15,17 +18,26 @@ Source1:	gtkwave.desktop
 Source2:	gtkwave-16.png
 Source3:	gtkwave-32.png
 Source4:	gtkwave-48.png
-Patch0:		gtkwave-3.3.28-array-size.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 0%{?fedora} > 1 || 0%{?rhel} > 3
+%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
+# 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
+%endif
 
 %description
 GTKWave is a waveform viewer that can view VCD files produced by most Verilog
@@ -34,14 +46,12 @@ tools.
 
 %prep
 %setup -q -n gtkwave-%{version}%{?prerel}
-cp -p .gtkwaverc gtkwaverc.sample
-
-# Array should be bigger
-%patch0 -p1
 
 %build
+export UPDATE_MIME_DATABASE=/bin/true
+export UPDATE_DESKTOP_DATABASE=/bin/true
 %{configure} --disable-dependency-tracking \
-%if 0%{?fedora} < 2 && 0%{?rhel} < 4
+%if ! %{have_tcl84}
 	--disable-tcl \
 %endif
 	--enable-judy
@@ -62,7 +72,6 @@ install -D -m 644 -p %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 
 # Include extra docs
 for extradoc in \
-	gtkwaverc.sample \
 	ANALOG_README.TXT \
 	CHANGELOG.TXT \
 	GNU.TXT \
@@ -73,22 +82,37 @@ do
 	install -p -m 644 ${extradoc} %{buildroot}%{_docdir}/gtkwave-%{version}/
 done
 
+# Don't want to package hidden files
+mv %{buildroot}%{_docdir}/gtkwave-%{version}/examples/.gtkwaverc \
+	%{buildroot}%{_docdir}/gtkwave-%{version}/examples/gtkwaverc
+
+# Remove broken desktop files
+rm -f %{buildroot}%{_datadir}/applications/x-gtkwave-extension-*.desktop
+
 %clean
 rm -rf %{buildroot}
 
 %post
+touch --no-create %{_datadir}/icons/gnome &>/dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
+	touch --no-create %{_datadir}/icons/gnome &>/dev/null || :
+	gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
 	touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %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/gnome &>/dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
@@ -112,9 +136,56 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/vzt2vcd
 %{_bindir}/vztminer
 %{_datadir}/applications/gtkwave.desktop
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-ae2.png
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-aet.png
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-evcd.png
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-fst.png
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-ghw.png
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-gtkw.png
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-lx2.png
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.png
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.png
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-vcd.png
+%{_datadir}/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.gtkwave-vzt.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-ae2.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-aet.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-evcd.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-fst.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-ghw.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-gtkw.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-lx2.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-vcd.png
+%{_datadir}/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.gtkwave-vzt.png
+%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-ae2.png
+%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-aet.png
+%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-evcd.png
+%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-fst.png
+%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-ghw.png
+%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-gtkw.png
+%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-lx2.png
+%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-lxt.png
+%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-lxt2.png
+%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-vcd.png
+%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.gtkwave-vzt.png
+%{_datadir}/icons/gtkwave_256x256x32.png
+%{_datadir}/icons/gtkwave_files_256x256x32.png
+%{_datadir}/icons/gtkwave_savefiles_256x256x32.png
 %{_datadir}/icons/hicolor/16x16/apps/gtkwave.png
 %{_datadir}/icons/hicolor/32x32/apps/gtkwave.png
 %{_datadir}/icons/hicolor/48x48/apps/gtkwave.png
+%{_datadir}/mime/packages/x-gtkwave-extension-ae2.xml
+%{_datadir}/mime/packages/x-gtkwave-extension-aet.xml
+%{_datadir}/mime/packages/x-gtkwave-extension-evcd.xml
+%{_datadir}/mime/packages/x-gtkwave-extension-fst.xml
+%{_datadir}/mime/packages/x-gtkwave-extension-ghw.xml
+%{_datadir}/mime/packages/x-gtkwave-extension-gtkw.xml
+%{_datadir}/mime/packages/x-gtkwave-extension-lx2.xml
+%{_datadir}/mime/packages/x-gtkwave-extension-lxt.xml
+%{_datadir}/mime/packages/x-gtkwave-extension-lxt2.xml
+%{_datadir}/mime/packages/x-gtkwave-extension-vcd.xml
+%{_datadir}/mime/packages/x-gtkwave-extension-vzt.xml
 %{_mandir}/man1/evcd2vcd.1*
 %{_mandir}/man1/fst2vcd.1*
 %{_mandir}/man1/ghwdump.1*
@@ -134,6 +205,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Fri Dec 16 2011 Paul Howarth <paul at city-fan.org> 3.3.29-1
+- update to 3.3.29
+  - added OSX integration when compiled against gtk-osx
+  - added mime types and icons for file types and desktop menus
+  - changed .sav (deprecated but not removed) to .gtkw, with .gtkw itself being
+    able to bring up the original dumpfile
+  - numerous bug fixes
+  - preliminary GConf support supporting session ID-based restore
+  - preliminary GConf support to emulate OSX "open" functionality such that
+    dumpfiles/savefiles can be targeted to an open gtkwave viewer/session ID
+- drop upstreamed array size patch
+- add scriptlet snippets for new desktop functionality
+
 * Mon Nov 14 2011 Paul Howarth <paul at city-fan.org> 3.3.28-1
 - update to 3.3.28
   - use larger, more readable Apple fonts for Quartz
diff --git a/sources b/sources
index d3b7488..dab3cc3 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-396cc15cfc12801c9ad6af507ee4a0f1  gtkwave-3.3.28.tar.gz
+ca55432a249c7420520ddd330c14e8e0  gtkwave-3.3.29.tar.gz
 2cc7754492918591242bc38a0b11d2a5  gtkwave-16.png
 410c50539074403d3a3240f7c9209b11  gtkwave-32.png
 4fdb2fec2b6d9732e2f111c6cd63b788  gtkwave-48.png

More information about the scm-commits mailing list