Browse Source

2014-09-18 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* eboard, kasumi, w3m and xmlto: removed libpng12 denpendency
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8957 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
54486be4e5
4 changed files with 85 additions and 40 deletions
  1. 20 6
      e/eboard/eboard-vl.spec
  2. 21 12
      k/kasumi/kasumi-vl.spec
  3. 35 18
      w/w3m/w3m-vl.spec
  4. 9 4
      x/xmlto/xmlto-vl.spec

+ 20 - 6
e/eboard/eboard-vl.spec

@@ -1,16 +1,25 @@
+Name: eboard
 Summary: A chess board interface for ICS and engines
 Summary(ja): ICS (Internet Chess Servers) と思考エンジンに対応のチェスボード。
-Name: eboard
 Version: 1.1.1
-Release: 1%{?_dist_release}
-License: GPL
+Release: 2%{?_dist_release}
+
+License: GPLv2
 Group: Applications/Games
+URL: http://www.bergo.eng.br/eboard/
+
 Source: http://prdownloads.sourceforge.net/eboard/eboard-%{version}.tar.bz2
 Patch0: eboard-0.9.5jp.patch
 Patch1: eboard-1.1.1-ntext.patch
-URL: http://www.bergo.eng.br/eboard/
+Patch2: eboard-libpng-1.5.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk2-devel, libpng-devel
+BuildRequires: gtk2-devel
+BuildRequires: libpng-devel
+BuildRequires: desktop-file-utils
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: IKEDA, inagaki, owa
@@ -31,9 +40,10 @@ PGN (Portable Game Notation) フォーマットのゲームを表示すること
 %setup -q
 #patch -p1
 %patch1 -p0 -b .ntext
+%patch2 -p1 -b .libpng15
 
 %build
-%configure --man-prefix=%{_mandir}
+%configure --extra-libs=dl --man-prefix=%{_mandir}
 make
 
 %install
@@ -95,6 +105,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/applications/eboard.desktop
 
 %changelog
+* Mon Sep 15 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.1.1-2
+- added Patch2 to build with libpng16
+- added BuildRequires: desktop-file-utils
+
 * Sun May 16 2010 Shu KONNO <owa@bg.wakwak.com> 1.1.1-1
 - updated eboard to 1.1.1
 - added eboard-1.1.1-ntext.patch

+ 21 - 12
k/kasumi/kasumi-vl.spec

@@ -1,29 +1,35 @@
-Summary: personal dictionary management tool for Anthy
-Summary(ja): Anthy 個人辞書管理ツール
 Name: kasumi
+Summary: Personal dictionary management tool for Anthy
+Summary(ja): Anthy 個人辞書管理ツール
 Version: 2.5
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
+
+License: GPLv2
+Group: Applications/System
 URL: http://kasumi.sourceforge.jp/
 Source0: %{name}-%{version}.tar.gz
-License: GPL2
-Group: Applications/System
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pkgconfig gtk2-devel >= 2.6.0 glib2-devel
+BuildRequires: pkgconfig
 BuildRequires: anthy-devel
-BuildRequires(install): desktop-file-utils
+BuildRequires: glib2-devel
+BuildRequires: gtk2-devel >= 2.6.0
+BuildRequires: desktop-file-utils
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description
-personal dictionary management tool for Anthy
+Personal dictionary management tool for Anthy.
 
 %description -l ja
-Anthy 個人辞書管理ツール
+Anthy 用の個人辞書管理ツールです.
 
 %prep
 %setup -q
 
 %build
 %configure
-%__make
+make %{?_smp_mflags}
 
 %install
 %__rm -rf %{buildroot}
@@ -42,12 +48,12 @@ desktop-file-install --delete-original  \
 
 %post
 if [ -x %{_bindir}/update-desktop-database ] ; then
-%{_bindir}/update-desktop-database %{_datadir}/applications
+    %{_bindir}/update-desktop-database %{_datadir}/applications
 fi
 
 %postun
 if [ -x %{_bindir}/update-desktop-database ] ; then
-%{_bindir}/update-desktop-database %{_datadir}/applications
+    %{_bindir}/update-desktop-database %{_datadir}/applications
 fi
 
 %files -f %{name}.lang
@@ -59,6 +65,9 @@ fi
 %{_mandir}/man1/kasumi.1*
 
 %changelog
+* Mon Sep 15 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.5-3
+- rebuilt for removing dependency to libpng12
+
 * Tue Apr  5 2011 IWAI, Masaharu <iwai@alib.jp> 2.5-2
 - add BuildRequires(install): desktop-file-utils
 - execute update-desktop-database in post, postun

+ 35 - 18
w/w3m/w3m-vl.spec

@@ -1,4 +1,5 @@
-%define __perl_requires %{_rpmconfigdir}/perl.req | grep -v w3mhelp
+#define __perl_requires %{_rpmconfigdir}/perl.req | grep -v w3mhelp
+#define __find_requires /bin/true
 
 %define _docdir %{_defaultdocdir}
 
@@ -8,34 +9,42 @@ Summary: A Pager with WWW capability
 Summary(ja): World Wide Web に対応したページャ
 Name: w3m
 Version: 0.5.3
-Release: 1%{?_dist_release}
-Group: Applications/Internet
+Release: 2%{?_dist_release}
+
 License: BSD
+Group: Applications/Internet
 URL: http://w3m.sourceforge.net/
+
 Source0: %{name}-%{version}.tar.gz
 Source1: w3m.sh
 Source2: w3m.csh
 Source10: w3m-term
 Source11: filter-requires-w3m.sh
 
-Requires: perl, openssl >= 0.9, gc >= 6.2
-Requires(post,preun): alternatives
-Provides: webclient, pager
-Obsoletes: w3m-m17n
+Patch200: w3m-fh-def.patch
+Patch201: w3m-gc7.patch
 
-BuildRequires: openssl-devel >= 0.9
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: gc-devel >= 7.0
+BuildRequires: gtk2-devel
 BuildRequires: ncurses-devel
-BuildRequires: gc-devel >= 6.2
+BuildRequires: openssl-devel >= 0.9
 BuildRequires: sed
-BuildRequires: gtk2-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: perl
+Requires: openssl >= 0.9
+Requires(post): alternatives
+Requires(preun): alternatives
+
+Provides: webclient, pager
+Obsoletes: w3m-m17n
+
 
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: shaolin
 
 # work around for [VineSeed-x86_64:00178]
-%define __find_requires %{SOURCE11}
+%define __perl_requires %{SOURCE11}
 
 %description
 w3m is a pager with WWW capability. It IS a pager, but it can be
@@ -77,6 +86,9 @@ w3m-img は X 環境のターミナルエミュレータ上の w3m でインラ
 
 %prep
 %setup -q
+%patch200 -p0 -b .fh
+%patch201 -p1 -b .gc7
+
 find Bonus -type f | \
     xargs sed -i -e "s|/usr/local/bin/ruby|/usr/bin/ruby|g;"
 
@@ -91,9 +103,9 @@ find Bonus -type f | \
 	--with-editor=%{_sysbindir}/vi
 sed -i -e 's|#define USE_GPM 1|/* #undef USE_GPM */|' config.h
 sed -i -e 's|\-lgpm||g' Makefile
+sed -i -e 's|\-ldl|\-ldl \-lX11|g' Makefile
 make %{?_smp_mflags}
 
-
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
@@ -163,6 +175,11 @@ fi
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Mon Sep 15 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.5.3-2
+- updated Source11 to call /usr/lib/rpm/perl.req
+- added Patch200 and 201 for building current environment
+- rebuilt for removing libpng12 dependency
+
 * Thu Apr 21 2011 IWAI, Masaharu <iwai@alib.jp> 0.5.3-1
 - new upstream release
 - drop unnecessary patches: upstream fixed
@@ -239,10 +256,10 @@ fi
 - new upstream release
 - Obsoletes: w3m-m17n
 
-* Fri Mar 27 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5-0vl2
+* Fri Mar 26 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5-0vl2
 - add message catalogs to %%files
 
-* Fri Mar 27 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5-0vl1
+* Fri Mar 26 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5-0vl1
 - new upstream release
 - fix w3mimgdisplay path in w3m-term
 
@@ -262,7 +279,7 @@ fi
   w3m 0.3.2.2 - 2002-12-06
   * security fix: html_quote for img alt attributes
 
-* Fri Nov 28 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 0.3.2.1-0vl2
+* Fri Nov 29 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 0.3.2.1-0vl2
 - change default page path to /usr/doc/HTML.
   this should be changed to /usr/share/doc in next release.
   ( TODO: indexhtml package )
@@ -337,7 +354,7 @@ fi
 - 0.2.1-0vl4
 - rebuilt with openssl-0.9.6b
 
-* Sun Jun 23 2001 MATSUBAYASHI 'Shaolin' Kohji <shaolin@vinelinux.org>
+* Sun Jun 24 2001 MATSUBAYASHI 'Shaolin' Kohji <shaolin@vinelinux.org>
 - 0.2.1-0vl3
 - security fixes (http://www.lac.co.jp/security/snsadv/32.html)
 
@@ -390,7 +407,7 @@ fi
 * Sat Oct 30 1999 Yoichi Imai <bonaim@mutt.freemail.ne.jp>
 - updated from 990820 to 991028
 
-* Tue Aug 26 1999 Ryo Hattori <ryoh@vs01.vaio.ne.jp>
+* Thu Aug 26 1999 Ryo Hattori <ryoh@vs01.vaio.ne.jp>
 - updated from 990716 to 990820
 
 * Wed Aug 11 1999 Ryo Hattori <ryoh@vs01.vaio.ne.jp>

+ 9 - 4
x/xmlto/xmlto-vl.spec

@@ -1,12 +1,13 @@
+Name: xmlto
 Summary: A tool for converting XML files to various formats.
 Summary(ja): XML ファイルをさまざまなフォーマットへ変換するためのツール
-Name: xmlto
-Version: 0.0.23
+Version: 0.0.26
 Release: 1%{?_dist_release}
+
 License: GPLv2
 Group: Applications/Text
-URL: http://cyberelk.net/tim/xmlto/
-Source0: ftp://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
+URL: https://fedorahosted.org/xmlto/
+Source0: https://fedorahosted.org/releases/x/m/xmlto/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: docbook-style-xsl
@@ -46,6 +47,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 15 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.0.26-1
+- new upstream release
+- updated URL
+
 * Sun Apr 25 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.0.23-1
 - new upstream release
 - built with new toolchain