Hello community, here is the log from the commit of package VFlib3 for openSUSE:Factory checked in at 2017-08-10 14:04:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/VFlib3 (Old) and /work/SRC/openSUSE:Factory/.VFlib3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "VFlib3" Thu Aug 10 14:04:10 2017 rev:23 rq:512624 version:3.6.14 Changes: -------- --- /work/SRC/openSUSE:Factory/VFlib3/VFlib3.changes 2016-04-28 16:56:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.VFlib3.new/VFlib3.changes 2017-08-10 14:12:03.932771246 +0200 @@ -1,0 +2,20 @@ +Mon Jul 24 23:39:11 UTC 2017 - [email protected] + +- Rectify RPM groups and description typography. + +------------------------------------------------------------------- +Thu Jul 20 11:41:13 UTC 2017 - [email protected] + +- Switch to configure macro, uncomment japanese descriptions +- Take patches from debian: + * VFlib3-compare-always-false.patch + * VFlib3-freetype2.patch + * VFlib3-gnu_source-declaration.patch +- Remove patches obsoleted by the above: + * VFlib3-ppc64.patch + * comparison-is-always-false-due-to-limited-range-of-data-type.patch +- Link against freetype2 +- Split library to proper subpackage +- Reduce dependencies to contain only those really needed for build + +------------------------------------------------------------------- Old: ---- VFlib3-ppc64.patch comparison-is-always-false-due-to-limited-range-of-data-type.patch New: ---- VFlib3-compare-always-false.patch VFlib3-freetype2.patch VFlib3-gnu_source-declaration.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ VFlib3.spec ++++++ --- /var/tmp/diff_new_pack.1z154B/_old 2017-08-10 14:12:04.852641730 +0200 +++ /var/tmp/diff_new_pack.1z154B/_new 2017-08-10 14:12:04.856641167 +0200 @@ -1,7 +1,7 @@ # # spec file for package VFlib3 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,125 +16,131 @@ # +%define libname libVFlib3-5 Name: VFlib3 Version: 3.6.14 Release: 0 Summary: Versatile Font Library License: LGPL-2.1+ -Group: System/Libraries -#Summary(ja): "Versatile" フォントライブラリ +Group: Development/Libraries/C and C++ +Summary(ja): "Versatile" フォントライブラリ Url: http://www-masu.ist.osaka-u.ac.jp/~kakugawa/VFlib/ -Source0: http://www-masu.ist.osaka-u.ac.jp/~kakugawa/download/TypeHack/VFlib3-3.6.14.tar.bz2 +Source0: http://www-masu.ist.osaka-u.ac.jp/~kakugawa/download/TypeHack/VFlib3-%{version}.tar.bz2 Source1: vflibcap-tex -Patch1: VFlib3-ppc64.patch -Patch3: VFlib3-info-dir.patch -Patch4: VFlib3-include.patch -Patch5: comparison-is-always-false-due-to-limited-range-of-data-type.patch +Patch0: VFlib3-compare-always-false.patch +Patch1: VFlib3-freetype2.patch +Patch2: VFlib3-gnu_source-declaration.patch +Patch3: VFlib3-include.patch +Patch4: VFlib3-info-dir.patch +BuildRequires: autoconf213 BuildRequires: fdupes -BuildRequires: freetype-devel -BuildRequires: texlive-bin-devel -BuildRequires: texlive-devel -BuildRequires: xorg-x11 -BuildRequires: xorg-x11-devel -Requires(post): info -Requires(postun): info -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# %description -l ja -# -# VFlib は C 言語で書かれたフォントライブラリで、指定したフォン -# トのビットマップを得るための関数群を持っています。VFlib の特徴は、 -# さまざまなフォーマットのフォントをフォーマットの違いを気にする -# ことなく統一的に使うことができるところにあります。 -# -# -# VFlib では、以下のフォントフォーマットがサポートされています。 -# -# TeX 関連: PK, GF, VF, TFM -# Omega TeX 関連: OFM (レベル 0),OVF -# X Window 関連: PCF, BDF -# -# -# 著者： -# ------ -# -# 角川裕次 <[email protected]> +BuildRequires: imake +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(kpathsea) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +Requires(post): %{install_info_prereq} +Requires(postun): %{install_info_prereq} + +%description -l ja +VFlib は C 言語で書かれたフォントライブラリで、指定したフォン +トのビットマップを得るための関数群を持っています。VFlib の特徴は、 +さまざまなフォーマットのフォントをフォーマットの違いを気にする +ことなく統一的に使うことができるところにあります。 + +VFlib では、以下のフォントフォーマットがサポートされています。 + TeX 関連: PK, GF, VF, TFM + Omega TeX 関連: OFM (レベル 0),OVF + X Window 関連: PCF, BDF %description VFlib is a font library written in C language with several functions to -obtain bitmaps of fonts. Unique feature of VFlib is that fonts in +obtain bitmaps of fonts. A unique feature of VFlib is that fonts in different formats are accessed by unified interface. -VFlib supports the following font formats: TeX fonts: PK, GF, VF, -TFM Omega TeX fonts: OFM (level 0), OVF X Window fonts: PCF, BDF Other -fonts: TrueType, Type 1, HBF, Syotai Club, JG, ekanji +VFlib supports the following font formats: +* TeX fonts: PK, GF, VF, TFM Omega +* TeX fonts: OFM (level 0), OVF +* X Window fonts: PCF, BDF. +* Other fonts: TrueType, Type 1, HBF, Syotai Club, JG, ekanji + +%package -n %{libname} +Summary: Versatile font library VFlib3 +Group: System/Libraries + +%description -n %{libname} +VFlib is a font library written in C language with several functions to +obtain bitmaps of fonts. A unique feature of VFlib is that fonts in +different formats are accessed by unified interface. + +VFlib supports the following font formats: +* TeX fonts: PK, GF, VF, TFM Omega +* TeX fonts: OFM (level 0), OVF +* X Window fonts: PCF, BDF. +* Other fonts: TrueType, Type 1, HBF, Syotai Club, JG, ekanji %package -n VFlib3-devel Summary: Development libraries for VFlib3 Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} -Requires: freetype-devel -Requires: texlive-bin-devel -Requires: texlive-devel +Requires: %{libname} = %{version} +Requires: pkgconfig(freetype2) +Requires: pkgconfig(kpathsea) %description -n VFlib3-devel -Development libraries for VFlib3 +Development headers and libraries for VFlib3 %prep %setup -q -%patch1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%autopatch -p1 + +# libtool files must be having proper content +rm -f config.{cache,sub,guess} +ln -s %{_datadir}/libtool/build-aux/config.guess ./ +ln -s %{_datadir}/libtool/build-aux/config.sub ./ %build -rm -f config.cache -export CFLAGS="%{optflags} -D_GNU_SOURCE" -./configure --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ +autoconf-2.13 +%configure \ --with-kpathsea \ - --with-kpathsea-libdir=%{_libdir} \ - --with-freetype \ - --with-freetype-includedir=%{_includedir}/freetype \ - --with-freetype-libdir=%{_libdir} \ + --with-freetype2 \ + --with-freetype2-includedir=%{_includedir}/freetype2 \ --with-texmf-root=%{_datadir}/texmf \ - %{_target_cpu}-suse-linux-gnu + --with-gettext make %{?_smp_mflags} %install make prefix=%{buildroot}%{_prefix} \ infodir=%{buildroot}%{_infodir} \ mandir=%{buildroot}%{_mandir} \ + includedir=%{buildroot}%{_includedir} \ libdir=%{buildroot}%{_libdir} \ + bindir=%{buildroot}%{_bindir} \ + datadir=%{buildroot}%{_datadir} \ + runtimedir=%{buildroot}%{_datadir}/VFlib/%{version} \ install -install -m 644 $RPM_SOURCE_DIR/vflibcap-tex %{buildroot}%{_datadir}/VFlib/%{version}/ +install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/VFlib/%{version}/ +# remove duped docs +rm -rf %{buildroot}%{_datadir}/VFlib/%{version}/doc/ +find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot} %post -for i in VFlib-36 -do - %install_info --info-dir=%{_infodir} %{_infodir}/${i}.info.gz -done -/sbin/ldconfig - -%postun -for i in VFlib-36 -do - %install_info_delete --info-dir=%{_infodir} %{_infodir}/${i}.info.gz -done -/sbin/ldconfig +%install_info --info-dir=%{_infodir} %{_infodir}/VFlib-36.info%{ext_info} + +%preun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/VFlib-36.info%{ext_info} + +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %files -%defattr(-, root, root) %doc ANNOUNCE* CHANGES COPYING* DISTRIB* %{_infodir}/VFlib*info* %dir %{_datadir}/VFlib -%dir %{_datadir}/VFlib/site %dir %{_datadir}/VFlib/%{version} -%dir %{_datadir}/VFlib/%{version}/doc/ -%doc %{_datadir}/VFlib/%{version}/doc/* %dir %{_datadir}/VFlib/%{version}/t1lib/ %{_datadir}/VFlib/%{version}/t1lib/* %dir %{_datadir}/VFlib/%{version}/ccv/ @@ -143,12 +149,12 @@ %{_datadir}/VFlib/%{version}/ascii-jtex/* %{_datadir}/VFlib/%{version}/vflibcap* %{_bindir}/* + +%files -n %{libname} %{_libdir}/libVFlib3.so.* %files -n VFlib3-devel -%defattr(-, root, root) %{_libdir}/libVFlib3.so -%{_libdir}/libVFlib3.la %{_includedir}/* %changelog ++++++ VFlib3-compare-always-false.patch ++++++ #! /bin/sh /usr/share/dpatch/dpatch-run ## 03_comparison_always_false.dpatch by Matej Vela <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fix `comparison is always false' warnings on platforms where char ## DP: is unsigned by default (this might lead to infinite loops). @DPATCH@ diff -urNad vflib3-3.6.13~/src/sexp.c vflib3-3.6.13/src/sexp.c --- vflib3-3.6.13~/src/sexp.c +++ vflib3-3.6.13/src/sexp.c @@ -707,7 +707,7 @@ static int vf_sexp_do_read_from_stream(SEXP_STREAM stream, SEXP sexp); -static int vf_sexp_read_str(SEXP_STREAM stream, char ch, SEXP sexp); +static int vf_sexp_read_str(SEXP_STREAM stream, int ch, SEXP sexp); static int vf_sexp_skip(SEXP_STREAM stream); static char vf_get_char_esc(char **pp, SEXP_STREAM stream); #define NBUFFER_MIN 2*1024 @@ -787,7 +787,7 @@ } static int -vf_sexp_read_str(SEXP_STREAM stream, char ch, SEXP s) +vf_sexp_read_str(SEXP_STREAM stream, int ch, SEXP s) { char tmp[8]; int ch1, dq_str; ++++++ VFlib3-freetype2.patch ++++++ ++++ 738 lines (skipped) ++++++ VFlib3-gnu_source-declaration.patch ++++++ #! /bin/sh /usr/share/dpatch/dpatch-run ## 06_strdup_implicit_pointer_conversion.dpatch by OHURA Makoto <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fix Bug#464465 ## DP: Added -D_GNU_SOURCE to CFLAGS to enable prototype definition ## DP: of strdup(3). @DPATCH@ diff -urNad vflib3-3.6.14.dfsg~/configure.in vflib3-3.6.14.dfsg/configure.in --- vflib3-3.6.14.dfsg~/configure.in 2008-02-09 00:02:49.000000000 +0900 +++ vflib3-3.6.14.dfsg/configure.in 2008-02-09 00:10:21.000000000 +0900 @@ -46,7 +46,7 @@ AC_PROG_LN_S if test "x$CC" = xgcc; then - XX_CFLAGS="-g -Wall -pedantic -ansi" + XX_CFLAGS="-g -Wall -pedantic -ansi -D_GNU_SOURCE" else XX_CFLAGS= fi ++++++ vflibcap-tex ++++++ --- /var/tmp/diff_new_pack.1z154B/_old 2017-08-10 14:12:05.080609633 +0200 +++ /var/tmp/diff_new_pack.1z154B/_new 2017-08-10 14:12:05.080609633 +0200 @@ -5,7 +5,7 @@ ;; by [email protected] ;; -;; adapted for SuSE: +;; adapted for SUSE: ;; ;; - use "xgdvi" ;; - add "jis" and "jisg" to '((ascii-jtex-kanji "%f.jtex")'
