Browse Source

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

	* enscript, libksba: updated
	* loudmouth: rebuilt
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9276 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
dc7d4b065a
3 changed files with 80 additions and 43 deletions
  1. 34 19
      e/enscript/enscript-vl.spec
  2. 27 8
      l/loudmouth/loudmouth-vl.spec
  3. 19 16
      lib/libk/libksba/libksba-vl.spec

+ 34 - 19
e/enscript/enscript-vl.spec

@@ -1,6 +1,7 @@
 Summary:	A plain ASCII to PostScript converter
+Summary(ja):	ASCII 繝�く繧ケ繝医r PostScript 縺ォ螟画鋤縺吶k繝��繝ォ
 Name:		enscript
-Version:	1.6.5.2
+Version:	1.6.6
 Release:	1%{?_dist_release}
 License:	GPLv3+
 Group:		Applications/Publishing
@@ -14,30 +15,34 @@ Source1:	enscript-ruby-1.6.4.tar.gz
 Source2:	enscript-php-1.6.4.st
 #http://home.raxnet.net/downloads/viewcvs/php.st
 
-# RH #177336
-Patch1:		enscript-1.6.4-hilight.patch
 # RH #61294
 Patch3:		enscript-1.6.1-locale.patch
 
 # RH #224548
 Patch8:		enscript-wrap_header.patch
 
-Patch9:		enscript-1.6.4-rh457719.patch
 Patch10:	enscript-1.6.4-rh457720.patch
 Patch12:	enscript-rh477382.patch
-Requires(preun): /sbin/install-info
-Requires(post): /sbin/install-info
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch13:	enscript-build.patch
+Patch14:	enscript-manfixes.patch
+Patch15:	enscript-bufpos-crash.patch
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Obsoletes:	nenscript < 1.13++-13
 Provides:	nenscript = 1.13++-13
 
-BuildRequires:	autoconf, automake, gettext
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	gettext
 BuildRequires:	gettext-devel
+BuildRequires:	texinfo
+
+Requires(preun): /sbin/install-info
+Requires(post): /sbin/install-info
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
-
 %description
 GNU enscript is a free replacement for Adobe's Enscript
 program. Enscript converts ASCII files to PostScript(TM) and spools
@@ -46,22 +51,23 @@ file. Enscript can be extended to handle different output media and
 includes many options for customizing printouts.
 
 %description -l ja
-GNU enscript は Adobe Enscript に代わるフリーなプログラムです。
-Enscript は ASCII ファイルを PostScript(TM) に変換して、
-特定のプリンタに作成した PostScript ファイルをスプールしたり、
-ファイルに保存することができます。
-Enscript は異なる出力メディアを扱えるように拡張されており、
-プリント出力をカスタマイズするための多くのオプションを含んでいます。
+GNU enscript 縺ッ Adobe Enscript 縺ォ莉」繧上k繝輔Μ繝シ縺ェ繝励Ο繧ー繝ゥ繝�縺ァ縺吶€�
+Enscript 縺ッ ASCII 繝輔ぃ繧、繝ォ繧� PostScript(TM) 縺ォ螟画鋤縺励※縲�
+迚ケ螳壹�繝励Μ繝ウ繧ソ縺ォ菴懈�縺励◆ PostScript 繝輔ぃ繧、繝ォ繧偵せ繝励�繝ォ縺励◆繧翫€�
+繝輔ぃ繧、繝ォ縺ォ菫晏ュ倥☆繧九%縺ィ縺後〒縺阪∪縺吶€�
+Enscript 縺ッ逡ー縺ェ繧句�蜉帙Γ繝�ぅ繧「繧呈桶縺医k繧医≧縺ォ諡。蠑オ縺輔l縺ヲ縺翫j縲�
+繝励Μ繝ウ繝亥�蜉帙r繧ォ繧ケ繧ソ繝槭う繧コ縺吶k縺溘a縺ョ螟壹¥縺ョ繧ェ繝励す繝ァ繝ウ繧貞性繧薙〒縺�∪縺吶€�
 
 
 %prep
 %setup -q
-%patch1 -p1 -b .hilight
 %patch3 -p1 -b .locale
 %patch8 -p1 -b .wrap_header
-%patch9 -p1 -b .rh457719
 %patch10 -p1 -b .rh457720
 %patch12 -p1 -b .rh477382
+%patch13 -p1 -b .build
+%patch14 -p1 -b .manfixes
+%patch15 -p1 -b .bufpos-crash
 
 %{__tar} -C states/hl -zxf %{SOURCE1} ruby.st
 install -pm 644 %{SOURCE2} states/hl/php.st
@@ -69,7 +75,8 @@ install -pm 644 %{SOURCE2} states/hl/php.st
 
 %build
 autoreconf -fiv
-%configure --with-media=Letter
+export CPPFLAGS='%{optflags} -DPROTOTYPES'
+%configure --with-media=A4
 make %{?_smp_mflags}
 
 
@@ -125,6 +132,14 @@ fi
 
 
 %changelog
+* Fri Jan 16 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.6.6-1
+- updated to 1.6.6
+- added BR: texinfo
+- spec in UTF-8
+
+* Fri Mar 23 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.6.5.2-2
+- specify --with-media=A4 (Letter is rarely used in Japan)
+
 * Fri Mar 23 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.6.5.2-1
 - updated to 1.6.5.2
 - spec revamped based on Fedora
@@ -181,7 +196,7 @@ fi
 * Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
 - Bump release + rebuild.
 
-* Tue Feb 27 2001 Trond Eivind Glomsrクd <teg@redhat.com>
+* Tue Feb 27 2001 Trond Eivind Glomsr��スクd <teg@redhat.com>
 - langify
 
 * Wed Jul 12 2000 Prospector <bugzilla@redhat.com>

+ 27 - 8
l/loudmouth/loudmouth-vl.spec

@@ -2,17 +2,23 @@
 %define gnutls_ver 1.4.0
 
 Summary:        Loudmouth is a Jabber programming library written in C
+Summary(ja):    C言語で書かれた Jabber プロトコルライブラリ
 
 Name:           loudmouth
 Version:        1.4.3
-Release: 2%{?_dist_release}
+Release:        3%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.loudmouth-project.org/
 Source0:        http://ftp.imendio.com/pub/imendio/%{name}/src/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-1.4.3-certs_location.patch
+Patch1:		%{name}-1.4.3-async_assertion.patch
+Patch2:		%{name}-1.4.3-fix-sasl-md5-digest-uri.patch
+Patch3:		0001-Drop-stanzas-when-failing-to-convert-them-to-LmMessa.patch
+Patch4:		%{name}-1.4.3-glib-compile-fix.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  glib2-devel >= 2.4.0
 BuildRequires:	check-devel
@@ -31,7 +37,7 @@ and yet extensible to let you do anything the Jabber protocol allows.
 
 %package devel
 Summary:	Development files for %{name}
-Summary(ja):	Development files for %{name}
+Summary(ja):	%{name} の開発用ファイル
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel
@@ -49,6 +55,11 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .certs
+%patch1 -p1 -b .async
+%patch2 -p1 -b .uri
+%patch3 -p1 -b .stanza
+%patch4 -p1 -b .glibincl
 
 
 %build
@@ -77,23 +88,18 @@ cp -a docs/reference/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/%{name}/
 %check
 make check
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog NEWS README COPYING
 %{_libdir}/libloudmouth*.so.*
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libloudmouth*.so
@@ -103,6 +109,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.4.3-3
+- added Patch0, 1, 2, 3 and 4 from Fedora
+  * Wed Mar  7 2012 Daniel Drake <dsd@laptop.org> - 1.4.3-10
+  - Fix compile against new glib
+  * Sun Nov 15 2009 Brian Pepple <bpepple@fedoraproject.org> - 1.4.3-7
+  - Add patch to fix parser that stops on certain stanzas. (#509341)
+  * Fri Jun 12 2009 Brian Pepple <bpepple@fedoraproject.org> - 1.4.3-5
+  - Add patch to fix digest uri bug. (#503901)
+  * Fri Nov 28 2008 Brian Pepple <bpepple@fedoraproject.org> - 1.4.3-3
+  - Add patch to search correct location for ssl certs. (#473458)
+  - Add patch to fix async assertion. (#473436)
+- built with gnutls 3.2.20
+
 * Sun Oct 03 2010 Shu KONNO <owa@bg.wakwak.com> 1.4.3-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 19 - 16
lib/libk/libksba/libksba-vl.spec

@@ -1,22 +1,21 @@
 Summary: A library to access X.509 and CMS data structures.
-Summary(ja): X.509 云方太 CMS 犯□正厭瞻卞失弁本旦允月凶戶及仿奶皮仿伉
+Summary(ja): X.509 �𨳍��� CMS ����踵��𨬭��U��颯��踺��麄��柴��扎��押�
 Name:    libksba
-Version: 1.0.3
-Release: 2%{?_dist_release}
+Version: 1.3.2
+Release: 1%{?_dist_release}
 
-License: GPLv3
+License: GPLv3/LGPLv3
 Group:   System Environment/Libraries
 URL:     http://www.gnupg.org/
 Source0: ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2.sig
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # quick-n-dirty hack to ksba-config, TODO: consider using pkgconfig instead
 Patch1: libksba-1.0.3-multilib.patch
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gawk
 BuildRequires: libgpg-error-devel >= 1.2 
-BuildRequires: libgcrypt-devel >= 1.2.0
 
 %description
 KSBA is a library designed to build software based on the X.509 and
@@ -24,18 +23,18 @@ CMS protocols.
 
 %package devel
 Summary: Development headers and libraries for %{name}
-Summary(ja): %{name} 迕釩�目永母/仿奶皮仿伉
-Group:   Development/Libraries
+Summary(ja): %{name} �券��箝����/�押��硔���
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+
 %description devel
 %{summary}.
 
 
 %prep
 %setup -q
-
 %patch1 -p1 -b .multilib
 
 
@@ -49,17 +48,14 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
-
 %check
 make check
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -73,13 +69,13 @@ install-info %{_infodir}/ksba.info %{_infodir}/dir ||:
 
 %postun devel
 if [ $1 -eq 0 ]; then
-  install-info --delete %{_infodir}/ksba.info %{_infodir}/dir ||:
+    install-info --delete %{_infodir}/ksba.info %{_infodir}/dir ||:
 fi
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README* THANKS TODO VERSION
+%doc AUTHORS ChangeLog* COPYING* NEWS README* THANKS
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -92,6 +88,13 @@ fi
 
 
 %changelog
+* Sat Jan 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.3.2-1
+- updated to 1.3.2
+- built on current VineSeed
+
+* Sun Jun 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.3-3
+- rebuild with Vine6 environment
+
 * Thu Sep 25 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.0.3-2
 - new upstream release, based on 1.0.3-2 from Fedora 9
 - Vine's previous changelogs as follows:
@@ -174,12 +177,12 @@ fi
 * Tue Oct 19 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.9.9-0.fdr.1
 - 0.9.9
 
-* Thu Mar 20 2003 Ville Skytt<ville.skytta at iki.fi> - 0.4.7-0.fdr.1
+* Thu Mar 20 2003 Ville Skytt<ville.skytta at iki.fi> - 0.4.7-0.fdr.1
 - Update to 0.4.7, and to current Fedora guidelines.
 - Exclude %%{_libdir}/*.la.
 
 * Tue Feb 12 2003 Warren Togami <warren@togami.com> 0.4.6-1.fedora.3
 - temporary workaround to lib/dir conflict problem
 
-* Sat Feb  8 2003 Ville Skytt<ville.skytta at iki.fi> - 0.4.6-1.fedora.1
+* Sat Feb  8 2003 Ville Skytt<ville.skytta at iki.fi> - 0.4.6-1.fedora.1
 - First Fedora release.