Browse Source

updated: gtkwave

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1233 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 14 years ago
parent
commit
6c203b9eac
1 changed files with 24 additions and 9 deletions
  1. 24 9
      g/gtkwave/gtkwave-vl.spec

+ 24 - 9
g/gtkwave/gtkwave-vl.spec

@@ -2,7 +2,7 @@ Summary:	Waveform Viewer
 Summary(ja):	波形ビューワ
 Name:		gtkwave
 Version:	3.3.7
-Release:	2%{?_dist_release}
+Release:	4%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://gtkwave.sourceforge.net/
@@ -24,7 +24,7 @@ BuildRequires:	gperf
 BuildRequires:  flex
 BuildRequires:  desktop-file-utils
 
-BuildRequires:	/usr/include/tcl.h /usr/include/tk.h
+BuildRequires:	tk
 BuildRequires:	tcl >= 8.4
 
 %description
@@ -37,18 +37,26 @@ tools.
 %{__cp} -p .gtkwaverc gtkwaverc.sample
 
 %build
-%{configure} --disable-dependency-tracking --enable-judy
-%{__make} %{_smp_mflags}
+%configure \
+    --disable-dependency-tracking \
+%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+    --disable-xz \
+%endif
+    --enable-judy
+
+make %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install \
-	DESTDIR=%{buildroot} \
-	pkgdatadir=%{_docdir}/gtkwave-%{version} \
-	INSTALL="%{__install} -p"
+make install \
+    DESTDIR=%{buildroot} \
+    pkgdatadir=%{_docdir}/gtkwave-%{version} \
+    INSTALL="%{__install} -p"
 
 # Icons and desktop entry
-/usr/bin/desktop-file-install --vendor "" --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
+/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
@@ -123,6 +131,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Jun 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.3.7-4
+- BR: tk instead of /usr/include/tcl.h /usr/include/tk.h
+  (Thanks to takemikaduchi-san)
+
+* Sun Jun 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.3.7-3
+- added --disable-xz at Vine Linux 5
+
 * Sun Jun 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.3.7-2
 - Initial build for Vine Linux