updated libpaper-vl.spec: support JIS B series paper sizes; updated texlive-vl.spec: more supported Vine Linux 5

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

lib/libp/libpaper/libpaper-vl.spec

@@ -1,12 +1,12 @@
 Name:		libpaper
-Version:	1.1.23
+Version:	1.1.24
 Release:	1%{?_dist_release}
 Summary:	Library and tools for handling papersize
 Summary(ja):	用紙サイズを扱うライブラリとツール
 Group:		System Environment/Libraries
 License:	GPLv2
 URL:		http://packages.qa.debian.org/libp/libpaper.html
-Source0:	http://ftp.debian.org/debian/pool/main/libp/libpaper/%{name}_%{version}+nmu1.tar.gz
+Source0:	http://ftp.debian.org/debian/pool/main/libp/libpaper/%{name}_%{version}.tar.gz
 # Filed	upstream as:
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=496126
 Patch0:		libpaper-1.1.20-automake_1.10.patch
@@ -16,6 +16,9 @@ Patch1:		libpaper-1.1.23-debianbug475683.patch
 # Filed upstream as:
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=481213
 Patch2:		libpaper-useglibcfallback.patch
+# supported paper sizes of JIS B series
+Patch10:	libpaper-1.1.24-paperspecs-jis-b-series.patch
+
 BuildRequires:	libtool, gettext, gawk
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -42,10 +45,11 @@ This package contains headers and libraries that programmers will need
 to develop applications which use libpaper.
 
 %prep
-%setup -q -n %{name}-%{version}+nmu1
+%setup -q -n %{name}-%{version}
 %patch0 -p1 -b .automake110
 %patch1 -p1 -b .dlfix
 %patch2 -p1 -b .useglibcfallback
+%patch10 -p1 -b .paperspecs
 libtoolize
 
 %build
@@ -98,6 +102,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 08 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.24-1
+- new upstream release
+
+* Sat Jan 08 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.23-2
+- applied libpaper-1.1.24-paperspecs-jis-b-series.patch
+
 * Thu May 21 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 1.1.23-1
 - initial build for Vine Linux based of fedora development
 - add japanese summary

t/texlive/texlive-vl.spec

@@ -203,7 +203,7 @@ Obsoletes:   dvipdfmx <= 20090522
 Obsoletes:   xdvik <= 22.84.14, xdvik-motif <= 22.84.14
 %endif
 %if %{?_dist_release} == "vl5"
-Conflicts:   jadetex tetex dvipdfmx xdvik xdvik-motif
+Conflicts:   jadetex tetex dvipdfmx xdvik xdvik-motif jvf
 %endif
 
 Obsoletes:   tetex-latex tetex-afm tetex-type1 tetex-devel
@@ -371,6 +371,7 @@ conf_option --with-freetype2-include=`freetype-config --cflags | sed -e 's/-I//'
 conf_option --with-system-gd
 EOF
 
+## For vl5, libkpathsea and libptexenc libraries are static link
 %if %{enable_sharedlib}
 %__cat <<EOF >> ptexlive.cfg
 conf_option --enable-shared
@@ -826,10 +827,10 @@ fi
 
 
 %changelog
-* Sun Dec 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2009-12
+* Sat Jan 08 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2009-12
 - supported Vine Linux 5
-- changed a requirement of Japanese VF package
-  - Requires: texlive-jvf = 2009
+  - for vl5, changed a requirement of Japanese VF package
+    - added Requires: texlive-jvf = 2009 (vl5)
 
 * Wed Dec 01 2010 Shu KONNO <owa@bg.wakwak.com> 2009-11
 - rebuilt with poppler-0.14.2 (libpoppler has been up to so.7)