rpms/gtkwave/devel gtkwave.desktop, NONE, 1.1 .cvsignore, 1.64, 1.65 gtkwave.spec, 1.74, 1.75 sources, 1.64, 1.65

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21397

Modified Files:
	.cvsignore gtkwave.spec sources 
Added Files:
	gtkwave.desktop 
Log Message:
* Tue May  4 2010 Paul Howarth <paul at city-fan.org> 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



--- NEW FILE gtkwave.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=GTKWave
GenericName=Electronic Waveform Viewer
Comment=Display simulation results
Exec=gtkwave -n foo
Icon=gtkwave
Terminal=false
Type=Application
StartupNotify=true
Categories=Utility;GTK;Electronics;Engineering;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	21 Mar 2010 12:20:47 -0000	1.64
+++ .cvsignore	4 May 2010 15:26:24 -0000	1.65
@@ -1 +1,4 @@
-gtkwave-3.3.5.tar.gz
+gtkwave-3.3.6.tar.gz
+gtkwave-48.png
+gtkwave-32.png
+gtkwave-16.png


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- gtkwave.spec	21 Mar 2010 12:20:47 -0000	1.74
+++ gtkwave.spec	4 May 2010 15:26:24 -0000	1.75
@@ -1,16 +1,23 @@
 #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.3.5
+Version:	3.3.6
 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, Judy-devel, xz-devel, zlib-devel
-BuildRequires:	gperf, flex
+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
@@ -28,13 +35,6 @@ tools.
 %setup -q -n gtkwave-%{version}%{?prerel}
 %{__cp} -p .gtkwaverc gtkwaverc.sample
 
-# Fix permissions in lzma encapsulation 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 --enable-judy
 %{__make} %{_smp_mflags}
@@ -46,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 \
@@ -62,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}/
@@ -81,6 +103,10 @@ 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*
@@ -100,6 +126,13 @@ done
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue May  4 2010 Paul Howarth <paul at city-fan.org> 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 <paul at city-fan.org> 3.3.5-1
 - update to 3.3.5 (see CHANGELOG.TXT for details)
 - add Judy-devel buildreq for improved memory usage efficiency


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	21 Mar 2010 12:20:47 -0000	1.64
+++ sources	4 May 2010 15:26:24 -0000	1.65
@@ -1 +1,4 @@
-e37da8d6a8b48ee4548a93e9be532710  gtkwave-3.3.5.tar.gz
+2ec81279c1da7dcfac3f9eb348f7ec1e  gtkwave-3.3.6.tar.gz
+4fdb2fec2b6d9732e2f111c6cd63b788  gtkwave-48.png
+410c50539074403d3a3240f7c9209b11  gtkwave-32.png
+2cc7754492918591242bc38a0b11d2a5  gtkwave-16.png