2014-12-22 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* MySQL-ruby, gtkimageview: fixed spec
	* grep, keyutils, ruby-uconv: updated
	* icon-naming-utils: rebuilt
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9182 ec354946-7b23-47d6-9f5a-488ba84defc7

M/MySQL-ruby/MySQL-ruby-vl.spec

@@ -12,7 +12,7 @@ Name: MySQL-ruby
 Summary: mysql module for Ruby
 Summary(ja): Ruby 用の MySQL 拡張モジュール
 Version: 2.8.2
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 
 Group: Development/Libraries
 License: distributable
@@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ruby
 BuildRequires: ruby-devel >= 1.9.3
 BuildRequires: MySQL-devel
-Requires:      ruby(abi) = 1.9.1
+#Requires:      ruby(abi) = 1.9.1
 Provides:      ruby(mysql) = %{version}
 
 %description
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 22 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.8.2-4
+- removed Requires: ruby(abi)
+
 * Fri Dec 19 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.8.2-3
 - rebuild with ruby-2.1.5
 

g/grep/grep-vl.spec

@@ -1,7 +1,7 @@
 Summary: The GNU versions of grep pattern matching utilities.
 Summary(ja): GNU版 grep パターンマッチングユーティリティ
 Name: grep
-Version: 2.14
+Version: 2.21
 Release: 1%{?_dist_release}
 
 License: GPLv3+
@@ -15,12 +15,15 @@ Source3: GREP_COLORS
 Patch1: grep-2.11-gnulib-tests-rm-f.patch
 Patch2: grep-2.14-man-fix-R.patch
 
-Requires(post): install-info
-Requires(preun): install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pcre-devel >= 8.31
 BuildRequires: texinfo, gettext, gzip
 BuildRequires: autoconf, automake
+Requires(post): install-info
+Requires(preun): install-info
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 %description
 The GNU versions of commonly used grep utilities.  Grep searches
@@ -42,7 +45,7 @@ utility for searching through text.
 %prep
 %setup -q
 %patch1 -p1 -b .gnulib-tests-rm-f
-%patch2 -p1 -b .man-fix-R
+#patch2 -p1 -b .man-fix-R
 
 
 %build
@@ -81,7 +84,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc ABOUT-NLS AUTHORS THANKS TODO NEWS README ChangeLog COPYING
+%doc AUTHORS THANKS TODO NEWS README ChangeLog COPYING
 /bin/*
 %config(noreplace) %{_sysconfdir}/profile.d/colorgrep.*sh
 %config(noreplace) %{_sysconfdir}/GREP_COLORS
@@ -89,6 +92,10 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Mon Dec 22 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.21-1
+- updated to 2.21
+- dropt patch2 which was merged into upstream
+
 * Wed Oct 24 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.14-1
 - update to 2.14
 - build with pcre-8.31

g/gtkimageview/gtkimageview-vl.spec

@@ -1,16 +1,19 @@
-Summary:	Simple image viewer widget for GTK
-Summary(ja): 	GTK 用のシンプルなイメージビューワウィジェット
+Summary:	Simple image viewer widget
+Summary(ja): 	シンプルなイメージビューワウィジェット
 Name:		gtkimageview
 Version:	1.6.4
-Release: 	2%{?_dist_release}
-Source0:	%{name}-%{version}.tar.gz
-License:	LGPL
+Release: 	3%{?_dist_release}
+
 Group:		System Environment/Libraries
+License:	LGPLv2+
 URL:		http://trac.bjourne.webfactional.com/
 
+Source0:	%{name}-%{version}.tar.gz
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	gtk2-devel
-BuildRequires:  gtk-doc
+BuildRequires:  glib2-devel
+BuildRequires:	gtk2-devel >= 2.8.0
+BuildRequires:  gtk-doc >= 1.0
 
 
 %description
@@ -27,10 +30,8 @@ Among its features are:
     * GIF animation support. 
 
 %description -l ja
-GtkImageView は GTK 用のシンプルなイメージビューワウィジ
-ェットです。Eye of Gnome や gThumb のようなイメージビューア
-ペインを提供します。これによりイメージを表示したり編集したり
-するアプリケーションが簡単に開発できるようになります。
+GtkImageView は GTK 用のシンプルなイメージビューワウィジェットです。
+Eye of Gnome や gThumb のようなイメージビューアペインを提供します。これによりイメージを表示したり編集したりするアプリケーションが簡単に開発できるようになります。
 主な特徴は以下の通りです。
 
     * マウスやキーボードを使ったズーム
@@ -46,7 +47,7 @@ Summary:        Libraries and header files for gtkimageview
 Summary(ja):    gtkimageview 用のヘッダファイル及びライブラリ
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	gtk2-devel
+Requires:	pkgconfig
 
 %description devel
 This package contains the header files and libraries for
@@ -63,9 +64,12 @@ you will need to install gtkimageview-devel.
 %prep
 %setup -q
 
+# ad-hoc fix to build on current toolchain
+sed -i -e 's/-Werror//g' configure
+
 %build
 %configure --disable-static
-make
+make %{?_smp_mflags}
 
 
 %install
@@ -78,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/libgtkimageview.la
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%check
+make %{?_smp_mflags} check
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -90,12 +97,14 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root)
 %{_includedir}/gtkimageview/*
-#{_libdir}/libgtkimageview.a
 %{_libdir}/libgtkimageview.so
 %{_libdir}/pkgconfig/gtkimageview.pc
 %{_datadir}/gtk-doc/html/gtkimageview/*
 
 %changelog
+* Mon Dec 22 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.6.4-3
+- rebuilt on current VineSeed
+
 * Sun Oct 03 2010 Shu KONNO <owa@bg.wakwak.com> 1.6.4-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

i/icon-naming-utils/icon-naming-utils-vl.spec

@@ -1,19 +1,18 @@
 Summary: 	A script to handle icon names in desktop icon themes
-Summary(ja):    デスクトップアイコンテーマでアイコン名を扱うためのスクリプト
+Summary(ja):    デスクトップアイコンテーマ内でアイコン名を扱うためのスクリプト
 Name:           icon-naming-utils
 Version:        0.8.90
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:          Development/Tools
 License:        GPLv2
-URL:            http://tango-project.org/Standard_Icon_Naming_Specification
+URL:            http://tango.freedesktop.org/Tango_Icon_Library
 
-Source0:        icon-naming-utils-%{version}.tar.bz2
+Source0:        http://tango.freedesktop.org/releases/%{name}-%{version}.tar.bz2
 
 BuildArch:	noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  perl-XML-Simple
-Requires:       perl-XML-Simple
+BuildRequires:  perl(XML::Simple)
 
 %description
 A script for creating a symlink mapping for deprecated icon names to
@@ -42,6 +41,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dtds/*.dtd
 
 %changelog
+* Mon Dec 22 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.8.90-2
+- rebuilt on current VineSeed
+- updated URL
+
 * Sun May  1 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.8.90-1
 - updated to 0.8.90
 

k/keyutils/keyutils-vl.spec

@@ -1,15 +1,20 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 %define vermajor 1
-%define version %{vermajor}.2
+%define verminor 5.9
+%define version %{vermajor}.%{verminor}
+%define libapivermajor 1
+%define libapiversion %{libapivermajor}.5
+
 %define libdir /%{_lib}
 %define usrlibdir %{_prefix}/%{_lib}
-%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 Summary: Linux Key Management Utilities
 Summary(ja): Linux 鍵管理ユーティリティ
 Name: keyutils
 Version: %{version}
-Release: 4%{?_dist_release}
-License: GPL/LGPL
+Release: 1%{?_dist_release}
+License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 ExclusiveOS: Linux
 URL: http://people.redhat.com/~dhowells/keyutils/
@@ -18,6 +23,10 @@ Source0: http://people.redhat.com/~dhowells/keyutils/keyutils-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glibc-kernheaders >= 2.4-9.1.92
+Requires: %{name}-libs = %{version}-%{release}
+
+Distribution: Vine Linux
+Vendor: Project Vine
 
 %description
 Utilities to control the kernel key management facility and to provide
@@ -70,9 +79,11 @@ make \
 	NO_ARLIB=1 \
 	LIBDIR=%{libdir} \
 	USRLIBDIR=%{usrlibdir} \
+	BINDIR=%{_bindir} \
+	SBINDIR=%{_sbindir} \
 	RELEASE=.%{release} \
 	NO_GLIBC_KEYERR=1 \
-	CFLAGS="-Wall $RPM_OPT_FLAGS"
+	CFLAGS="-Wall $RPM_OPT_FLAGS -Werror"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +92,8 @@ make \
 	DESTDIR=$RPM_BUILD_ROOT \
 	LIBDIR=%{libdir} \
 	USRLIBDIR=%{usrlibdir} \
+	BINDIR=%{_bindir} \
+	SBINDIR=%{_sbindir} \
 	install
 
 %clean
@@ -89,25 +102,29 @@ rm -rf $RPM_BUILD_ROOT
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
+%if %{build_compat32}
 %post -n compat32-%{name}-libs -p /sbin/ldconfig
 %postun -n compat32-%{name}-libs -p /sbin/ldconfig
 
+%endif
+
 %files
 %defattr(-,root,root,-)
 %doc README LICENCE.GPL
-/sbin/*
-/bin/*
-/usr/share/keyutils
+%{_sbindir}/*
+%{_bindir}/*
+%{_datadir}/keyutils
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
-%config(noreplace) /etc/*
+%config(noreplace) %{_sysconfdir}/*
 
 %files libs
 %defattr(-,root,root,-)
 %doc LICENCE.LGPL
-%{libdir}/libkeyutils-%{version}.so
-%{libdir}/libkeyutils.so.%{vermajor}
+%{_mandir}/man7/*
+%{libdir}/libkeyutils.so.%{libapiversion}
+%{libdir}/libkeyutils.so.%{libapivermajor}
 
 %files libs-devel
 %defattr(-,root,root,-)
@@ -119,8 +136,8 @@ rm -rf $RPM_BUILD_ROOT
 %if %{build_compat32}
 %files -n compat32-%{name}-libs
 %defattr(-,root,root,-)
-%{libdir}/libkeyutils-%{version}.so
-%{libdir}/libkeyutils.so.%{vermajor}
+%{libdir}/libkeyutils.so.%{libapiversion}
+%{libdir}/libkeyutils.so.%{libapivermajor}
 
 %files -n compat32-%{name}-libs-devel
 %defattr(-,root,root,-)
@@ -128,6 +145,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec 22 2014 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5.9-1
+- updated to 1.5.9
+- rebuilt on current VineSeed
+
 * Thu Mar 24 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.2-4
 - rebuilt with new toolchains
 

r/ruby-uconv/ruby-uconv-vl.spec

@@ -1,16 +1,20 @@
 %define oname uconv
 
 Name: ruby-uconv
-Version: 0.5.3
+Summary: library for Ruby that converts UTF-8/16, UCS-4 <-> EUC-JP/Shift_JIS
+Summary(ja): UTF-8/16, UCS-4とEUC-JP/Shift_JISを相互変換するRubyライブラリ
+Version: 0.6.1
 Release: 1%{?_dist_release}
 License: Ruby's
-Group: Development/Languages
-Source: http://www.yoshidam.net/%{oname}-%{version}.tar.gz
+Group: Development/Libraries
 URL: http://www.yoshidam.net/Ruby_ja.html#uconv
+#'
+Source: http://www.yoshidam.net/%{oname}-%{version}.tar.gz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: ruby, ruby-devel >= 1.6.4-0vl3, diffutils
-Summary: library for Ruby that converts UTF-8/16, UCS-4 <-> EUC-JP/Shift_JIS
-Summary(ja): UTF-8/16, UCS-4とEUC-JP/Shift_JISを相互変換するRubyライブラリ
+BuildRequires: ruby
+BuildRequires: ruby-devel >= 1.6.4-0vl3
+BuildRequires: diffutils
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -25,7 +29,6 @@ Shift_JIS を使うのは Windows の場合が多いので，Windows で使わ
 Shift_JIS の変種である CP932 に対応しています．
 
 %prep
-
 %setup -q -c
 
 %build
@@ -57,6 +60,10 @@ rm -rf ${RPM_BUILD_ROOT}
 #%doc tmp/samples
 
 %changelog
+* Mon Dec 22 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.6.1-1
+- new upstream release
+- built with ruby 2.1.5
+
 * Sun Dec 30 2012 IWAI, Masaharu <iwai@alib.jp> 0.5.3-1
 - new upstream release
 - add Vendor and Distribution tags