Browse Source

2014-11-04 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* gnuchess, ibus-qt, openjade, opensp: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9058 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
adf9b1008a
4 changed files with 93 additions and 60 deletions
  1. 23 27
      g/gnuchess/gnuchess-vl.spec
  2. 12 5
      i/ibus-qt/ibus-qt-vl.spec
  3. 33 15
      o/openjade/openjade-vl.spec
  4. 25 13
      o/opensp/opensp-vl.spec

+ 23 - 27
g/gnuchess/gnuchess-vl.spec

@@ -1,21 +1,17 @@
 Summary: The GNU chess program.
 Summary(ja): GNU チェスゲーム
 Name: gnuchess
-Version: 5.07
-Release: 4%{?_dist_release}
+Version: 6.1.2
+Release: 1%{?_dist_release}
 
-License: GPL
+License: GPLv3+
 Group: Applications/Games
 URL: ftp://ftp.gnu.org/pub/gnu/chess/
 
-Source: ftp://ftp.gnu.org/pub/gnu/chess/%{name}-%{version}.tar.gz
-##Source1: http://ftp.gnu.org/pub/gnu/chess/book_1.00.pgn.gz
+Source: http://ftp.gnu.org/pub/gnu/chess/%{name}-%{version}.tar.gz
+#Source1: http://ftp.gnu.org/pub/gnu/chess/book_1.02.pgn.gz
 # use precompiled book.dat:
-Source1: http://ftp.gnu.org/pub/gnu/chess/book.dat.gz
-#Patch0: gnuchess-5.02-fsstnd.patch
-Patch1: gnuchess-5.06-bookpath.patch
-Patch2: gnuchess-5.07-common.patch
-Patch3: gnuchess-5.07-getline.patch
+Source1: book_1.02.dat.gz
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ncurses-devel
@@ -44,42 +40,42 @@ GNUチェスプログラムを含むパッケージです。デフォルトは
 より、グラフィカルに楽しめます。
 
 コンピュータ上でチェスを楽しみたいのであればこのパッケージをインストー
-ルしましょう。ただし、グラフィカルに楽しみたいのであれば、xbordとX
-Window Systemをあらかじめインストールしておいてください。
+ルしましょう。ただし、グラフィカルに楽しみたいのであれば、xboardとX
+Window System をあらかじめインストールしておいてください。
 
 
 %prep
 %setup -q -n %{name}-%{version}
-#%patch0 -p1 -b .fsp
-%patch1 -p1 -b .bp
-%patch2 -p1 -b .common
-%patch3 -p1 -b .getline
-gzip -dc %{SOURCE1} > book/book.dat
+gzip -dc %{SOURCE1} > book.dat
 
 %build
 %configure
-make 
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/var/lib/games/gnuchess $RPM_BUILD_ROOT/usr/bin
-install -m 755 src/gnuchess $RPM_BUILD_ROOT/usr/bin
-install -m 644 book/book.dat $RPM_BUILD_ROOT/var/lib/games/gnuchess
-
-cd $RPM_BUILD_ROOT
-strip usr/bin/gnuchess
+mkdir -p $RPM_BUILD_ROOT/var/lib/games/gnuchess $RPM_BUILD_ROOT%{_bindir}
+install -m 755 src/gnuchess $RPM_BUILD_ROOT%{_bindir}
+install -m 644 book.dat $RPM_BUILD_ROOT%{_var}/lib/games/gnuchess
+#Add gnuchess.ini, BZ 1075958
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnuchess/
+install -m 644 src/gnuchess.ini $RPM_BUILD_ROOT%{_datadir}/gnuchess/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc doc/* COPYING AUTHORS NEWS TODO README
 %attr(2755,root,games) %{_bindir}/%{name}
-%dir /var/lib/games/%{name}
-%attr(664,root,games) /var/lib/games/%{name}/book.dat
-%doc doc/* COPYING 
+%{_datadir}/gnuchess/gnuchess.ini
+%dir %{_var}/lib/games/%{name}
+%attr(664,root,games) %{_var}/lib/games/%{name}/book.dat
 
 %changelog
+* Tue Nov  4 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 6.1.2-1
+- updated to 6.1.2
+
 * Tue Apr 19 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 5.07-4
 - add missing BuildRequires: flex
 

+ 12 - 5
i/ibus-qt/ibus-qt-vl.spec

@@ -1,9 +1,8 @@
-%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.8.0)
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 
-%define	ver	1.3.0
-%define	rel	2
+%define	ver	1.3.2
+%define	rel	1
 
 Summary: Qt IBus library and Qt input method plugin
 Name: ibus-qt
@@ -17,9 +16,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: cmake
 BuildRequires: qt4-devel >= 4.5
 BuildRequires: dbus-devel >= 1.2
+BuildRequires: ibus-devel >= 1.3.7
 BuildRequires: libicu-devel >= 4.0
 BuildRequires: doxygen >= 1.6
-Requires: ibus >= 1.3
+Requires: ibus >= 1.3.7
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -30,6 +30,7 @@ This includes Qt IBus library and Qt input method plugin.
 
 %package devel
 Summary: Development tools for ibus Qt
+Summary(ja): ibus Qt の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -43,11 +44,13 @@ The ibus-qt-devel package contains the header files for ibus Qt library.
 %cmake \
     -DCMAKE_INSTALL_PREFIX=%{_usr} \
     -DLIBDIR=%{_libdir}
+
 make \
     VERBOSE=1 \
     C_DEFINES="$RPM_OPT_FLAGS" \
     CXX_DEFINES="$RPM_OPT_FLAGS" \
     %{?_smp_mflags}
+
 make docs
 
 %install
@@ -63,7 +66,7 @@ make install DESTDIR=%{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS README INSTALL
+%doc AUTHORS COPYING README 
 %{_libdir}/libibus-qt.so.*
 %{_qt4_plugindir}/inputmethods/libqtim-ibus.so
 
@@ -75,6 +78,10 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/libibus-qt.so
 
 %changelog
+* Tue Nov  4 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.3.2-1
+- updated to 1.3.2
+- added BR: ibus-devel
+
 * Sat Jan  7 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.3.0-2
 - rebuilt with qt-4.8.0
 

+ 33 - 15
o/openjade/openjade-vl.spec

@@ -1,23 +1,31 @@
 Summary: A DSSSL implementation.
+Summary(ja): DSSSL 言語の実装
 Name: openjade
 Version: 1.3.2
-Release: 31%{?_dist_release}
-Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
+Release: 32%{?_dist_release}
+
+License: BSD
+Group: Applications/Text
+URL: http://openjade.sourceforge.net/
+
+Source0: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
+
 Patch0: openjade-ppc64.patch
 Patch1: openjade-1.3.1-nsl.patch
 Patch2: openjade-deplibs.patch
 Patch3: openjade-nola.patch
-License: BSD
-Group: Applications/Text
+Patch4: openjade-1.3.2-gcc46.patch
+Patch5: openjade-getoptperl.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Obsoletes: openjade-devel < 1.3.2-17
-Obsoletes: jade
-Provides: jade
+BuildRequires: opensp-devel
+BuildRequires: libtool
 Requires(post): sgml-common >= 0.5
 Requires(preun): sgml-common >= 0.5
 
-BuildRequires: opensp-devel
+Obsoletes: openjade-devel < 1.3.2-17
+Obsoletes: jade
+Provides: jade
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -37,20 +45,19 @@ XML, RTF, TeX, MIF (FrameMaker), SGML, or XML.
 %patch1 -p1
 %patch2 -p1 -b .deplibs
 %patch3 -p1 -b .nola
+%patch4 -p1 -b .gcc46
+%patch5 -p1 -b .getopt
 
 %build
 %configure --disable-static --datadir=%{_datadir}/sgml/%{name}-%{version} \
 	--enable-splibdir=%{_libdir}
-make 
+
+make LIBTOOL=%{_bindir}/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install install-man DESTDIR=$RPM_BUILD_ROOT
-
-# Fix up libtool libraries
-find $RPM_BUILD_ROOT -name '*.la' | \
-  xargs perl -p -i -e "s|-L$RPM_BUILD_DIR[\w/.-]*||g"
+make install install-man DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool
 
 # oMy, othis ois osilly.
 ln -s openjade $RPM_BUILD_ROOT/%{_prefix}/bin/jade
@@ -67,6 +74,8 @@ touch %{name}-%{version}-%{release}.soc
 ln -s %{name}-%{version}-%{release}.soc %{name}.soc
 cd -
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,10 +102,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %{_mandir}/*/*
 %{_datadir}/sgml/%{name}-%{version}
-%exclude %{_libdir}/*.la
+#%{_libdir}/*.la
 
 
 %changelog
+* Tue Nov  4 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.3.2-32
+- rebuilt on current VineSeed environment
+- used system libtool
+- added Patch4 and 5 from fc
+  * Fri Aug 10 2012 Ondrej Vasik <ovasik@redhat.com> 1.3.2-41
+  - avoid build failure with using Getopt::Std;
+  * Wed Jun 08 2011 Ondrej Vasik <ovasik@redhat.com> 1.3.2-38
+  - fix build with gcc46 (upstream bug tracker)
+
 * Mon Dec 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.2-31
 - rebuild with VineSeed environment
 

+ 25 - 13
o/opensp/opensp-vl.spec

@@ -2,17 +2,21 @@ Summary: SGML and XML parser
 Summary(ja): SGML, XML パーサ
 Name: opensp
 Version: 1.5.2
-Release: 8%{?_dist_release}
+Release: 9%{?_dist_release}
+
+License: MIT
+Group: Applications/Text
 URL: http://openjade.sourceforge.net/
+
 Source: http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz
 Patch0: opensp-multilib.patch
 Patch1: opensp-nodeids.patch
 Patch2: opensp-sigsegv.patch
-License: BSD
-Group: Applications/Text
+Patch3: opensp-manpage.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: xmlto, jadetex
+BuildRequires: jadetex
+BuildRequires: xmlto
 Requires: sgml-common >= 0.5
 
 Vendor: Project Vine
@@ -26,6 +30,7 @@ application and a set of components, including a generic API.
 
 %package devel
 Summary: Files for developing applications that use OpenSP
+Summary(ja): OpenSP を用いるアプリケーションの開発に必要なファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -38,21 +43,26 @@ Header files and libtool library for developing applications that use OpenSP.
 %patch0 -p1 -b .multilib
 %patch1 -p1 -b .nodeids
 %patch2 -p1 -b .sigsegv
+%patch3 -p1 -b .manpage
+# convert files to UTF-8
+iconv -f latin1 -t utf8 ChangeLog -o ChangeLog.tmp
+mv -f ChangeLog.tmp ChangeLog
 
 %build
 %configure --disable-dependency-tracking --disable-static --enable-http \
  --enable-default-catalog=%{_sysconfdir}/sgml/catalog \
  --enable-default-search-path=%{_datadir}/sgml:%{_datadir}/xml
-make %{?_smp_mflags}
+
+# specify --skip-validation option 
+make %{?_smp_mflags} XMLTO="%{_bindir}/xmlto --skip-validation"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Fix up libtool libraries
-find $RPM_BUILD_ROOT -name '*.la' | \
-  xargs perl -p -i -e "s|-L$RPM_BUILD_DIR[\w/.-]*||g"
+# Get rid of libtool libraries
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # oMy, othis ois osilly.
 for file in nsgmls sgmlnorm spam spent sx ; do
@@ -72,18 +82,13 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSP
 
 %find_lang sp5
 
-## remove unuse files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-
 
 %check
 make check || : # failures as of 1.5.2pre1 :(
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -106,6 +111,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov  3 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.5.2-9
+- converted doc files to UTF
+- added XMLTO option to build on current xmlto
+- added Patch3 from FC
+  * Thu Aug 15 2013 Ondrej Vasik <ovasik@redhat.com> - 1.5.2-18
+  - fix the inconsistency between man page and help (#854941)
+
 * Mon Dec 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.5.2-8
 - rebuild with VineSeed environment