perl trouble, caused by prereq

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=133
This commit is contained in:
Dr. Werner Fink 2013-07-17 12:54:39 +00:00 committed by Git OBS Bridge
parent 551839d82c
commit 0a4c6a0812
3 changed files with 15 additions and 24 deletions

View File

@ -1,11 +0,0 @@
--- t/utils.t
+++ t/utils.t 2013-07-17 08:46:39.829939441 +0000
@@ -45,7 +45,7 @@ is(File::Spec->canonpath(locate_biber_fi
SKIP: {
skip "No LaTeX installation", 1 unless can_run('kpsewhich');
# using kpsewhich
- like(File::Spec->canonpath(locate_biber_file('plain.tex')), qr|plain.tex\cM*\z|, 'File location - 4');
+ like(File::Spec->canonpath(locate_biber_file('plain.tex')), qr|plain.tex|, 'File location - 4');
}
# In output_directory

View File

@ -1,8 +1,7 @@
-------------------------------------------------------------------
Wed Jul 17 08:54:11 UTC 2013 - werner@suse.de
- Add patch biber-perl.dif to avoid trouble with Test::Builder of
perl 5.16.2
- Use PreReq for own packages instead of Requires(pre)
-------------------------------------------------------------------
Tue Jul 16 12:36:45 UTC 2013 - werner@suse.de

View File

@ -53,6 +53,19 @@ Summary: The TeXLive Formatting System
License: GPL-2.0+ and GPL-2.0 and GPL-3.0 and LPPL-1.3c and LPPL-1.0 and Artistic-1.0 and Apache-2.0 and MIT and BSD-3-Clause and SUSE-TeX and SUSE-Public-Domain
Group: Productivity/Publishing/TeX/Base
Url: http://www.tug.org/texlive/
PreReq: %{name}-filesystem >= %{texlive_version}
PreReq: %{name}-kpathsea-bin >= %{texlive_version}
PreReq: %{name}-kpathsea >= %{texlive_version}
PreReq: %{name}-tetex-bin >= %{texlive_version}
PreReq: %{name}-tetex >= %{texlive_version}
PreReq: %{name}-texconfig-bin >= %{texlive_version}
PreReq: %{name}-texconfig >= %{texlive_version}
#!BuildIgnore: %{name}-kpathsea-bin
#!BuildIgnore: %{name}-kpathsea
#!BuildIgnore: %{name}-tetex-bin
#!BuildIgnore: %{name}-tetex
#!BuildIgnore: %{name}-texconfig-bin
#!BuildIgnore: %{name}-texconfig
Requires(pre): /usr/bin/perl
Requires(pre): /usr/bin/clear
Requires(pre): /usr/bin/dialog
@ -61,13 +74,6 @@ Requires(pre): ed
Requires(pre): findutils
Requires(pre): grep
Requires(pre): sed
Requires(pre): %{name}-filesystem >= %{texlive_version}
Requires(pre): %{name}-kpathsea-bin >= %{texlive_version}
Requires(pre): %{name}-kpathsea >= %{texlive_version}
Requires(pre): %{name}-tetex-bin >= %{texlive_version}
Requires(pre): %{name}-tetex >= %{texlive_version}
Requires(pre): %{name}-texconfig-bin >= %{texlive_version}
Requires(pre): %{name}-texconfig >= %{texlive_version}
Requires(post): coreutils
Requires(postun): coreutils
Requires(posttrans): coreutils
@ -186,8 +192,6 @@ Patch17: source-64.dif
Patch18: source-a2ping.dif
Patch19: source-dvipng.dif
Patch20: source-asymptote.dif
# PATCH-FIX-OPENSUSE Avoid trouble with perl 5.16.2 Test::Builder
Patch31: biber-perl.dif
Prefix: %{_bindir}
%{expand: %%global options %(mktemp /tmp/texlive-opts.XXXXXXXX)}
@ -2041,8 +2045,7 @@ development packages for TeXLive.
%patch0
%if %{with buildbiber}
pushd ../biblatex-biber-*
chmod -Rf a+rX,u+w,g-w,o-w .
%patch31 -p0 -b .pmb
/usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
popd
%endif