Browse Source

drop BR: poppler-devel temporaly; modify tl11supp-120120-vine.patch, texlive-20110705-vine.patch to do that

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7042 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 11 years ago
parent
commit
34b41a7a13

+ 2 - 2
t/texlive/texlive-20110705-vine.patch

@@ -10,7 +10,7 @@ diff -up texlive-2011/build/texlive-20110705-source/Build\~ texlive-2011/build/t
 +
 +  (cd ..
 +  ## Avoid pollution from internal libraries.
-+  rm -rf ./libs/{expat,freetype2,gd,jpeg,libpng,libttf,ncurses,type1,t1lib,unzip,xpdf,zlib} || exit 1
++  rm -rf ./libs/{expat,freetype2,gd,jpeg,libpng,libttf,ncurses,type1,t1lib,unzip,zlib} || exit 1
 +  ## XXX Hacks to avoid accidental version clashs with system libraries.
 +  hack_libs=(
 +      zlib
@@ -18,7 +18,7 @@ diff -up texlive-2011/build/texlive-20110705-source/Build\~ texlive-2011/build/t
 +      t1lib
 +      freetype2
 +      gd
-+      xpdf
++      
 +  )
 +  for i in "${hack_libs[@]}"; do 
 +      mkdir -p ./libs/${i}

+ 8 - 3
t/texlive/texlive-vl.spec

@@ -1,5 +1,6 @@
 ## -*- coding: utf-8-unix -*-
 %bcond_with firstbuild
+%bcond_with sources
 
 %define enable_sharedlib 1
 %if %{?_dist_release} == "vl6"
@@ -34,7 +35,7 @@ Summary: The TeX text formatting system
 Summary(ja): TeX 文書整形システム
 Name: texlive
 Version: 2011
-Release: 6%{?_dist_release}
+Release: 7%{?_dist_release}
 License: distributable
 Group: Applications/Publishing
 URL: http://www.tug.org/texlive/
@@ -110,7 +111,7 @@ Requires(post,postun): fontconfig >= 2.6.0-2
 Requires(post): ed mktemp
 Requires(post): vutils >= 2.0.5
 %{!?with_firstbuild:BuildRequires: texlive-common = %{version}}
-BuildRequires: texlive-sources = %{version}
+%{!?with_sources:BuildRequires: texlive-sources = %{version}}
 BuildRequires: xz
 BuildRequires: unzip
 BuildRequires: bison flex
@@ -125,7 +126,7 @@ BuildRequires: XOrg-devel
 BuildRequires: freetype2-devel >= 2.1.10
 BuildRequires: autoconf >= 2.68
 BuildRequires: openMotif-devel
-BuildRequires: poppler-devel >= 0.12
+#BuildRequires: poppler-devel >= 0.12
 BuildRequires: openssl-devel
 BuildRequires: libpaper-devel
 BuildRequires: fontconfig-devel
@@ -713,6 +714,10 @@ fi
 
 
 %changelog
+* Tue Oct 30 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2011-7
+- drop BR: poppler-devel temporaly
+  - modify tl11supp-120120-vine.patch, texlive-20110705-vine.patch to do that
+
 * Mon May 28 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2011-6
 - build with poppler-0.18.4
 - remove tlmgr

+ 1 - 1
t/texlive/tl11supp-120120-vine.patch

@@ -45,7 +45,7 @@ diff -up texlive-2011/tl11/common.sh.vine texlive-2011/tl11/common.sh
 +  --enable-makejvf --enable-pxdvik --enable-dvipsk \
 +  --enable-tetex --enable-texlive \
 +  \
-+  --with-system-xpdf \
++  \
 +  --with-system-gd \
 +  --with-system-t1lib \
 +  --with-system-libpng \