Browse Source

2015-02-17 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* Judy: rebuilt
	* gtkwave: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9356 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
4f87b773a2
2 changed files with 34 additions and 29 deletions
  1. 15 13
      J/Judy/Judy-vl.spec
  2. 19 16
      g/gtkwave/gtkwave-vl.spec

+ 15 - 13
J/Judy/Judy-vl.spec

@@ -1,18 +1,13 @@
 Name:           Judy
 Version:        1.0.5
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        General purpose dynamic array
+Summary(ja):    汎用の動的配列ライブラリ
 
 Group:          System Environment/Libraries
-# The source code itself says:
-# "GNU Lesser General Public License as published by the
-#  Free Software Foundation; either version 2 of the License,
-#  or (at your option) any later version."
-# This will probably change to LGPLv2 in a future upstream release,
-# but until then, LGPLv2+ is the proper license.  Confirmed
-# with upstream on 2008/11/28.
 License:        LGPLv2+
 URL:            http://sourceforge.net/projects/judy/
+
 Source0:        http://downloads.sourceforge.net/judy/Judy-%{version}.tar.gz
 Source1:	README.Fedora
 # Make tests use shared instead of static libJudy.
@@ -20,12 +15,11 @@ Patch0:		Judy-1.0.4-test-shared.patch
 # The J1* man pages were incorrectly being symlinked to Judy, rather
 # than Judy1.  This patch corrects that.  Submitted upstream 2008/11/27.
 Patch1:		Judy-1.0.4-fix-Judy1-mans.patch
+# Fix some code with undefined behavior, commented on and removed by gcc
+Patch2:		Judy-1.0.5-undefined-behavior.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-#BuildRequires:
-#Requires:       
-
 %description
 Judy is a C library that provides a state-of-the-art core technology
 that implements a sparse dynamic array. Judy arrays are declared
@@ -41,6 +35,7 @@ population.
 
 %package devel
 Summary:	Development libraries and headers for Judy
+Summary(ja):	Judy の開発用ライブラリとヘッダファイル
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -53,13 +48,14 @@ for developing applications that use the Judy library.
 %setup -q -n judy-%{version}
 %patch0 -p1 -b .test-shared
 %patch1 -p1 -b .fix-Judy1-mans
+%patch2 -p1 -b .behavior
 cp -p %{SOURCE1} .
 
 
 %build
+export CFLAGS="%{optflags} -fno-strict-aliasing -fno-tree-ccp -fno-tree-dominator-opts -fno-tree-copy-prop -fno-tree-vrp"
 %configure --disable-static
 make 
-#%{?_smp_mflags}
 # fails to compile properly with parallel make:
 # http://sourceforge.net/tracker/index.php?func=detail&aid=2129019&group_id=55753&atid=478138
 
@@ -91,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README README.Fedora
+%doc AUTHORS ChangeLog COPYING README README.Fedora examples/
 %{_libdir}/*.so.*
 
 %files devel
@@ -103,6 +99,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 11 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.0.5-2
+- rebuilt on current VineSeed
+- added patch2 from Fedora
+  * Tue Feb 18 2014 Paul Howarth <paul@city-fan.org> - 1.0.5-8
+  - Fix some code with undefined behavior
+
 * Sat Feb 11 2012 NAKAMURA Kenta <kenta@vinelinux.org> - 1.0.5-1
 - updated to 1.0.5
 

+ 19 - 16
g/gtkwave/gtkwave-vl.spec

@@ -1,8 +1,8 @@
 Summary:	Waveform Viewer
 Summary(ja):	波形ビューワ
 Name:		gtkwave
-Version:	3.3.31
-Release:	2%{?_dist_release}
+Version:	3.3.64
+Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://gtkwave.sourceforge.net/
@@ -22,8 +22,10 @@ BuildRequires:	gperf
 BuildRequires:  flex
 BuildRequires:  desktop-file-utils
 
-BuildRequires:	tk
-BuildRequires:	tcl >= 8.4
+BuildRequires:	tk-devel
+BuildRequires:	tcl-devel >= 8.4
+
+Requires:       electronics-menu
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -59,17 +61,10 @@ make install \
 %{__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 \
-	ANALOG_README.TXT \
-	CHANGELOG.TXT \
-	GNU.TXT \
-	LICENSE.TXT \
-	MIT.TXT \
-	SYSTEMVERILOG_README.TXT
-do
-	%{__install} -p -m 644 ${extradoc} %{buildroot}%{_docdir}/gtkwave-%{version}/
-done
+# docs_to_include
+rm -rf docs_to_include
+mkdir -p docs_to_include
+mv %{buildroot}%{_docdir}/gtkwave-%{version}/* docs_to_include
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -88,9 +83,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/gtkwave-%{version}/
+%doc AUTHORS COPYING ChangeLog LICENSE.TXT README
+%doc docs_to_include/* 
 %{_bindir}/evcd2vcd
 %{_bindir}/fst2vcd
+%{_bindir}/fstminer
 %{_bindir}/ghwdump
 %{_bindir}/gtkwave
 %{_bindir}/lxt2miner
@@ -118,6 +115,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/mime/packages/x-gtkwave-extension-*.xml
 %{_mandir}/man1/evcd2vcd.1*
 %{_mandir}/man1/fst2vcd.1*
+%{_mandir}/man1/fstminer.1*
 %{_mandir}/man1/ghwdump.1*
 %{_mandir}/man1/gtkwave.1*
 %{_mandir}/man1/lxt2miner.1*
@@ -135,6 +133,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Wed Feb 11 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.3.64-1
+- updated to 3.3.64
+- used BR: tcl-devel, tk-devel instead of tcl, tk
+- added R: electronics-menu
+
 * Mon Jan  7 2013 IWAI, Masaharu <iwai@alib.jp> 3.3.31-2vl7
 - build with Tcl/Tk 8.5.7-1
 - add Vendor and Distribution tags