Browse Source

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

	* cjs, gjs: changed Group
	* expect, tclx, thread: updated
	* pclock, tix: rebuilt
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9210 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 7 years ago
parent
commit
bbe8bfbb93
7 changed files with 161 additions and 91 deletions
  1. 14 8
      c/cjs/cjs-vl.spec
  2. 63 41
      e/expect/expect-vl.spec
  3. 12 7
      g/gjs/gjs-vl.spec
  4. 20 10
      p/pclock/pclock-vl.spec
  5. 15 9
      t/tclx/tclx-vl.spec
  6. 27 11
      t/thread/thread-vl.spec
  7. 10 5
      t/tix/tix-vl.spec

+ 14 - 8
c/cjs/cjs-vl.spec

@@ -1,14 +1,16 @@
 Summary:     Javascript binding for Cinnamon
+Summary(ja): Cinnamon 向け JavaScript バインディング
 Name:        cjs
 Version:     2.2.2
-Release:     1%{?_dist_release}
+Release:     2%{?_dist_release}
 Source0:     %{name}-%{version}.tar.gz
 
 License:     MPL1.1/LGPLv2+/GPLv2+
-Group:       User Interface/Desktops
+Group:       System Environment/Libraries
 URL:         http://live.gnome.org/GnomeShell
 
-BuildRequires:	pkgconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires:	pkgconfig >= 0.14.0
 BuildRequires:	glib2-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	gobject-introspection-devel >= 1.29.16
@@ -17,14 +19,12 @@ BuildRequires:	js-devel
 BuildRequires:	yelp-tools
 BuildRequires:	desktop-file-utils
 BuildRequires:	autoconf >= 2.69
-BuildRequires:	automake112
+BuildRequires:	automake
 BuildRequires:	gnome-common
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-Vendor:			Project Vine
+Vendor:		Project Vine
 Distribution:	Vine Linux
-Packager:		Takemikaduchi
+Packager:	Takemikaduchi
 
 
 %description
@@ -33,6 +33,7 @@ This module contains JavaScript bindings based on gobject-introspection.
 
 %package	devel
 Summary:	Development files of the %{name} library.
+Summary(ja):	%{name} ライブラリの開発用ファイル
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
@@ -87,6 +88,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Thu Jan  1 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.2.2-2
+- moved to System Environment/Libraries Group
+- added Japanese summary
+- changed BR: automake instead of automake112
+
 * Sun Aug 31 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2.2-1
 - new upstream release
 

+ 63 - 41
e/expect/expect-vl.spec

@@ -2,46 +2,56 @@
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 %define tcl_major 8.4
-%define thread_major 2.5
-%define majorver 5.44
+%define majorver 5.45
 
 Summary: A Tcl/Tk development environment: expect 
 Summary(ja): Tcl/Tk 開発環境: expect
 Name: expect
-Version: %{majorver}.1.15
+Version: %{majorver}
 Release: 1%{?_dist_release}
+License: Public Domain
 Group: Development/Languages
+# URL: probably more useful is http://sourceforge.net/projects/expect/
 URL: http://expect.nist.gov/
-License: Public Domain
-Source0: http://expect.nist.gov/src/%{name}-%{version}.tar.bz2
-# Patch500: fixes change log file permissions
-Patch500: expect-5.43.0-log_file.patch
-# Patch501: fixes install location, change pkgIndex
-Patch501: expect-5.43.0-pkgpath.patch
-# Patch502: fixes bz456738, expectk is unsupported by upstream actually,
-#	but the patch is under discussion (patch by Sergei Golovan)
-Patch502: expect-5.44.1.15-tk-init.patch
-# Patch503: fixes bz742911
-Patch503: expect-5.44.1.15-match-gt-numchars-segfault.patch
-# Patch504: bz674866, proposed upstream, not accepted yet
-# https://sourceforge.net/tracker/?func=detail&aid=3404934&group_id=13179&atid=113179
-Patch504: expect-5.45-man-page.patch
+
+Source: http://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz
+# Patch0: fixes change log file permissions
+Patch0: expect-5.43.0-log_file.patch
+# Patch1: fixes install location, change pkgIndex
+Patch1: expect-5.43.0-pkgpath.patch
+# Patch2: fixes minor man page formatting issue
+Patch2: expect-5.45-man-page.patch
+# Patch3: fixes segmentation fault during matching characters
+Patch3: expect-5.45-match-gt-numchars-segfault.patch
+# Patch4: fixes memory leak when using -re, http://sourceforge.net/p/expect/patches/13/
+Patch4: expect-5.45-re-memleak.patch
+# Patch5: use vsnprintf instead of vsprintf to avoid buffer overflow
+Patch5: expect-5.45-exp-log-buf-overflow.patch
+# Patch6: fixes segfaults if Tcl is built with stubs and Expect is used directly
+#   from C program rhbz#1091060
+Patch6: expect-5.45-segfault-with-stubs.patch
+# Patch7: fixes leaked fd, patch by Matej Mužila, rhbz#1001220
+Patch7: expect-5.45-fd-leak.patch
 # examples patches
-# Patch600: changes random function
-Patch600: expect-5.32.2-random.patch
-# Patch601: bz547686, no response from upstream
-Patch601: expect-5.44.1.15-unbuffer-exit-code.patch
-# Patch602: bz735962, proposed to upstream, not accepted yet
-# https://sourceforge.net/tracker/?func=detail&aid=3404914&group_id=13179&atid=113179
-Patch602: expect-5.45-passmass-su-full-path.patch
+# Patch100: changes random function
+Patch100: expect-5.32.2-random.patch
+# Patch101: fixes bz674184 - mkpasswd fails randomly
+Patch101: expect-5.45-mkpasswd-dash.patch
+# Patch102: fixes bz703702 - let user know that telnet is needed for
+# running some examples
+Patch102: expect-5.45-check-telnet.patch
+# Patch103: use full path to 'su', it's safer
+Patch103: expect-5.45-passmass-su-full-path.patch
+# Patch104: rhbz 963889, fixes inaccuracy in mkpasswd man page
+Patch104: expect-5.45-mkpasswd-man.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: tcl >= %{tcl_major}
 BuildRequires: tk >= %{tcl_major}
-BuildRequires: thread >= %{thread_major}
 BuildRequires: autoconf
-BuildRequires: libX11-devel
 BuildRequires: chrpath
+BuildRequires: libX11-devel
+BuildRequires: libXft-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -58,6 +68,7 @@ package.
 
 %package devel
 Summary: Development files for expect library.
+Summary(ja): expect ライブラリの開発用ファイル
 Group: Development/Libraries
 Requires: expect = %{version}-%{release}
 Obsoletes: expect <= 5.43-0vl4
@@ -66,25 +77,34 @@ Obsoletes: expect <= 5.43-0vl4
 This package contains development files for the expect library.
 
 %package -n expectk
-Summary: expectk and some scripts
-Group: Development/Languages
+Summary: A program-script interaction and testing utility
+Group: Development/Tools
 Requires: expect = %{version}-%{release}
 Obsoletes: expect <= 5.43-0vl4
 
 %description -n expectk
-This package contains expectk and some scripts that use it.
+This package originally contained expectk and some scripts
+that used it. As expectk was removed from upstream tarball
+in expect-5.45, now the package contains just these scripts.
+Please use tclsh with package require Tk and Expect instead
+of expectk.
 
 %prep
-%setup -q
-%patch500 -p1 -b .log_file
-%patch501 -p1 -b .pkgpath
-%patch502 -p1 -b .tk-init
-%patch503 -p1 -b .match-gt-numchars-segfault
-%patch504 -p1 -b .man-page
+%setup -q -n expect%{version}
+%patch0 -p1 -b .log_file
+%patch1 -p1 -b .pkgpath
+%patch2 -p1 -b .man-page
+%patch3 -p1 -b .match-gt-numchars-segfault
+%patch4 -p1 -b .re-memleak
+%patch5 -p1 -b .exp-log-buf-overflow
+%patch6 -p1 -b .segfault-with-stubs
+%patch7 -p1 -b .fd-leak
 # examples fixes
-%patch600 -p1 -b .random
-%patch601 -p1 -b .unbuffer-exit-code
-%patch602 -p1 -b .passmass-su-full-path
+%patch100 -p1 -b .random
+%patch101 -p1 -b .mkpasswd-dash
+%patch102 -p1 -b .check-telnet
+%patch103 -p1 -b .passmass-su-full-path
+%patch104 -p1 -b .mkpasswd-man
 # -pkgpath.patch touch configure.in
 aclocal
 autoconf
@@ -93,7 +113,7 @@ autoconf
 
 %build
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --enable-shared \
-	--with-tclinclude=%{_includedir}/tcl-private
+	--with-tclinclude=%{_includedir}/tcl-private/generic
 make %{?_smp_mflags}
 
 %check
@@ -164,17 +184,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n expectk
 %defattr(-,root,root,-)
-%{_bindir}/expectk
 %{_bindir}/multixterm
 %{_bindir}/tknewsbiff
 %{_bindir}/tkpasswd
 %{_bindir}/xpstat
-%{_mandir}/man1/expectk.1*
 %{_mandir}/man1/multixterm.1*
 %{_mandir}/man1/tknewsbiff.1*
 
 
 %changelog
+* Wed Dec 31 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 5.45-1
+- updated to 5.45
+- rebuilt with tcl/tk 8.5.15
+
 * Fri Jan  4 2013 IWAI, Masaharu <iwai@alib.jp> 5.44.1.15-1
 - update to 5.44.1.15:sync ed Hat Enterprise Linux 6 expect-5.44.1.15-4.el6
 - add BuildRequires: tk, chrpath

+ 12 - 7
g/gjs/gjs-vl.spec

@@ -1,17 +1,19 @@
 %define pkg_version 1.42.0
-%define pkg_release 1%{?_dist_release}
+%define pkg_release 2%{?_dist_release}
 
 Summary:     Javascript binding for GNOME
+Summary(ja): GNOME 向け JavaScript バインディング
 Name:        gjs
 Version:     %{pkg_version}
 Release:     %{pkg_release}
 Source0:     http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.42/%{name}-%{version}.tar.xz
 
 License:     MPL1.1/LGPLv2+/GPLv2+
-Group:       User Interface/Desktops
+Group:       System Environment/Libraries
 URL:         http://live.gnome.org/GnomeShell
 
-BuildRequires: pkgconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: pkgconfig >= 0.14.0
 BuildRequires: glib2-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: gobject-introspection-devel >= 1.29.16
@@ -20,11 +22,9 @@ BuildRequires: mozjs24-devel
 BuildRequires: yelp-tools
 BuildRequires: desktop-file-utils
 BuildRequires: autoconf >= 2.69
-BuildRequires: automake112
+BuildRequires: automake
 BuildRequires: gnome-common
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: Takemikaduchi
@@ -36,8 +36,8 @@ GNOME Shell is the defining technology of the GNOME 3 desktop user experience. I
 
 %package devel
 Summary:     Development files of the gjs library.
+Summary(ja): gjs ライブラリの開発用ファイル
 Group:       Development/Libraries
-
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 Requires: gtk-doc
@@ -87,6 +87,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Thu Jan  1 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.42.0-2
+- moved to System Environment/Libraries Group
+- added Japanese summary
+- changed BR: automake instead of automake112
+
 * Sun Oct 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.42.0-1
 - new upstream release
 

+ 20 - 10
p/pclock/pclock-vl.spec

@@ -1,16 +1,21 @@
 Summary: simple analog clock program designed to run under WindowMaker
-Summary(ja): Window Maker の dock 用のアナログ時計
+Summary(ja): WindowMaker のドック用アナログ時計
 Name: pclock
 Version: 0.13.1
-Release: 2%{?_dist_release}
-Source: http://bnt.kourakos.com/~awk/programs/pclock-%{version}.tgz
-License: GPL
+Release: 4%{?_dist_release}
+License: GPLv2
 Group: User Interface/Desktops
-URL: http://www.kourakos.com/~awk/programs/pclock/
+URL: http://tincho.org/pclock/
+
+Source: http://tincho.org/pclock/download/%{name}-%{version}.tgz
+
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libX11-devel
+BuildRequires: libXext-devel
+BuildRequires: libXpm-devel 
+
 Vendor: Project Vine
 Distribution: Vine Linux
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libX11-devel libXext-devel libXpm-devel 
 
 %description
 pclock is a simple analog clock program designed to run under the
@@ -18,15 +23,13 @@ WindowMaker window manager. Any 64x64 pixmap may be used as a background,
 including tiles.
 
 %description -l ja
-pclock は、WindowMaker の下で動かすよう設計された、シンプルなアナログ
-時計のプログラムです。64x64 ピクセルの画像を背景に設定できます。
+pclock は、WindowMaker の下で動かすよう設計された、シンプルなアナログ時計のプログラムです。64x64 ピクセルの画像を背景に設定できます。
 
 %prep
 %setup -q
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" 
-# LIBDIR="-L/usr/X11R6/%{_lib}"
 strip src/pclock
 
 %install
@@ -46,6 +49,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING CREDITS README TODO
 
 %changelog
+* Wed Dec 31 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.13.1-4
+- rebuilt on current VineSeed
+- updated URL
+
+* Wed Jun 20 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.13.1-3
+- rebuild with Vine6 environment
+
 * Sun Feb 21 2010 Shu KONNO <owa@bg.wakwak.com> 0.13.1-2
 - rebuilt with new toolchain
 

+ 15 - 9
t/tclx/tclx-vl.spec

@@ -1,23 +1,24 @@
-%define tcl_major	8.4
-%define tk_major	8.4
-%define thread_major	2.6
+%define tcl_major	8.5
+%define tk_major	8.5
+%define thread_major	2.7
 %define tclx_major	8.4
 %define tclxvers        %{tclx_major}
 Summary: A Tcl/Tk development environment: tclX
 Summary(ja): Tcl/Tk 開発環境: tclX
 Name: tclx
-Version: %{tclxvers}
-Release: 3%{?_dist_release}
+Version: %{tclxvers}.1
+Release: 1%{?_dist_release}
 Group: Development/Languages
 License: BSD
-Source0:   ftp://ftp.tcl.tk/pub/tcl/nightly-cvs/tclx-20070227.tar.gz
+Source0: http://downloads.sourceforge.net/project/tclx/TclX/8.4.1/%{name}%{version}.tar.bz2
+
+Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: tcl >= %{tcl_major}
 BuildRequires: tk >= %{tk_major}
 BuildRequires: thread >= %{thread_major}
 Requires: tcl >= %{tcl_major}
 Requires: tk >= %{tk_major}
 Requires: thread >= %{thread_major}
-Buildroot: %{_tmppath}/%{name}-root
 
 Distribution: Vine Linux
 Vendor: Project Vine
@@ -43,7 +44,7 @@ tcl と tk のパッケージも必要です。
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}%{tclxvers}
 
 
 %build
@@ -110,9 +111,14 @@ perl -pi -e 's|(^%{_mandir}/man.*$)|\1\*|' *.files
 rm -rf $RPM_BUILD_ROOT
 
 %files -f tclx.files -n tclx
+%doc ChangeLog README
 
 %changelog
-* Sun Apr 17 2011 Shu KONNO <owa@bg.wakwak.com> 8.4.2-3
+* Wed Dec 31 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 8.4.1-1
+- updated to 8.4.1
+- rebuilt with tcl/tk 8.5.15 and thread 2.7.1
+
+* Sun Apr 17 2011 Shu KONNO <owa@bg.wakwak.com> 8.4-3
 - rebuilt with rpm-4.8.1-3
 
 * Tue Jun 29 2010 Shu KONNO <owa@bg.wakwak.com> 8.4.2-2

+ 27 - 11
t/thread/thread-vl.spec

@@ -1,21 +1,26 @@
-%define tclmajor 8.4
-%define majorver 2.6
+%define tclmajor 8.5
+%define majorver 2.7
 
 Summary: A Tcl/Tk development environment: thread
 Summary(ja): Tcl/Tk 開発環境: thread
 Name: thread
-Version: %{majorver}.5
-Release: 3%{?_dist_release}
+Version: %{majorver}.1
+Release: 1%{?_dist_release}
 License: BSD
 Group: Development/Languages
-BuildRequires: libtool, util-linux, perl, gdbm
+URL: http://tcl.sourceforge.net/
+Source0: http://prdownloads.sourceforge.net/tcl/%{name}%{version}.tar.gz
+
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libtool
+BuildRequires: util-linux
+BuildRequires: perl
+BuildRequires: gdbm
 BuildRequires: tcl >= %{tclmajor}
 BuildRequires: tk >= %{tclmajor}
 Requires: tcl >= %{tclmajor}
 Requires: tk >= %{tclmajor}
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-URL: http://tcl.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/tcl/%{name}%{version}.tar.gz
+
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -30,16 +35,23 @@ You can use this extension to gain script-level access to Tcl threading capabili
 %build
 chmod 755 ./configure
 %configure \
---with-tcl=%{_libdir} --with-tk=%{_libdir}  --enable-shared \
---enable-threads --enable-64bit
+    --with-tcl=%{_libdir} \
+    --with-tk=%{_libdir} \
+    --enable-shared \
+    --enable-threads \
+    --enable-64bit
+
 make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
+rm -f *.files
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 echo "%%defattr(-,root,root)" > thread.files
 (find ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l;
+ find ${RPM_BUILD_ROOT}%{_includedir}/*;
  find ${RPM_BUILD_ROOT}%{_libdir}/*) | cat - *.files \
 	| sort | uniq -u >> thread.files
 
@@ -81,8 +93,12 @@ rm -rf ${RPM_BUILD_ROOT}
 rm -f *.files
 
 %files -f thread.files -n thread
+%doc README ChangeLog doc/html/*
 
 %changelog
+* Wed Dec 31 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.7.1-1
+- updated to 2.7.1
+
 * Sat Apr 16 2011 Shu KONNO <owa@bg.wakwak.com> 2.6.5-3
 - rebuilt with rpm-4.8.1-3
 

+ 10 - 5
t/tix/tix-vl.spec

@@ -1,6 +1,6 @@
-%define tcl_major	8.4
-%define tk_major	8.4
-%define thread_major	2.6
+%define tcl_major	8.5
+%define tk_major	8.5
+%define thread_major	2.7
 %define tix_major	8.4
 %define tixversion	%{tix_major}.3
 ## can't find all provides
@@ -10,13 +10,16 @@ Summary: A Tcl/Tk development environment: tix
 Summary(ja): Tcl/Tk 開発環境: tix
 Name: tix
 Version: %{tixversion}
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Group: Development/Languages
 License: BSD
 URL: http://tix.sourceforge.net/
+
 Source0: Tix%{tixversion}-src.tar.gz
 Patch20: tix-8.1.4-perf.patch
 Patch22: tix-8.2.0b1-dirtree.patch
+
+Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: tcl >= %{tcl_major}
 BuildRequires: tk >= %{tk_major}
 BuildRequires: thread >= %{thread_major}
@@ -24,7 +27,6 @@ BuildRequires: libX11-devel
 Requires: tcl >= %{tcl_major}
 Requires: tk >= %{tk_major}
 Requires: thread >= %{thread_major}
-Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 Tix (Tk Interface Extension), an add-on for the Tk widget set, is an
@@ -153,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 31 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 8.4.3-3
+- rebuilt with tcl/tk 8.5.15 and thread 2.7.1
+
 * Thu Feb 24 2011 Shu KONNO <owa@bg.wakwak.com> 8.4.3-2
 - added BR: libX11-devel