From 5bb0894e1a4fac90fbf5f955c837ec3e7c20d78a8783cb0e45556f24704001b3 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 22 May 2012 08:44:37 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=68 --- texlive-rpmlintrc | 3 --- texlive.changes | 6 ++++++ texlive.spec | 26 +++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/texlive-rpmlintrc b/texlive-rpmlintrc index a295fd0..4d7cc19 100644 --- a/texlive-rpmlintrc +++ b/texlive-rpmlintrc @@ -15,10 +15,7 @@ addFilter(".*name-repeated-in-summary.*") addFilter(".*non-conffile-in-etc.*/etc/texmf/ls-R.*") addFilter(".*rpm-buildroot-usage.*") addFilter(".*binary-or-shlib-calls-gethostbyname.*") -addFilter(".*invalid-license.*SUSE-TeX.*") -addFilter(".*permissions-file-setuid-bit.*/usr/bin/public.*") addFilter(".*zero-length.*") addFilter(".*dangling-symlink.*/usr/lib/mktex/public.*") addFilter(".*devel-dependency.*texlive-lua-visual-debug.*") -addFilter(".*permissions-unauthorized-file.*") addFilter(".*obsolete-not-provided.*") diff --git a/texlive.changes b/texlive.changes index 8dabf92..e2a6609 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 22 08:12:13 UTC 2012 - werner@suse.de + +- Install manaul page of biber as this is also build +- Require the used perl version for biber + ------------------------------------------------------------------- Mon May 21 11:22:16 UTC 2012 - werner@suse.de diff --git a/texlive.spec b/texlive.spec index fa4a3d1..fbb239d 100644 --- a/texlive.spec +++ b/texlive.spec @@ -124,6 +124,7 @@ BuildRequires: pango-tools # # perl(Text::BibTeX) # +%define perl_version %(rpm -q --qf '%{VERSION}' perl) BuildRequires: perl(Config::AutoConf) >= 0.15 BuildRequires: perl(Data::Compare) BuildRequires: perl(Data::Dump) @@ -4193,6 +4194,9 @@ License: LPPL-1.0 Summary: Binary files of biber Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +%if %{with buildbiber} +Requires: perl = %{perl_version} +%endif Prefix: %{_bindir} %description biber-bin @@ -4301,6 +4305,7 @@ License: LPPL-1.0 Summary: Binary files of cjkutils Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +Obsoletes: texlive-bin-cjk < %{texlive_version} Prefix: %{_bindir} %description cjkutils-bin @@ -4385,6 +4390,7 @@ License: LPPL-1.0 Summary: Binary files of cweb Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +Obsoletes: texlive-bin-devel < %{texlive_version} Prefix: %{_bindir} %description cweb-bin @@ -4505,6 +4511,7 @@ License: LPPL-1.0 Summary: Binary files of dviljk Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +Obsoletes: texlive-bin-dvilj < %{texlive_version} Prefix: %{_bindir} %description dviljk-bin @@ -4745,6 +4752,7 @@ License: LPPL-1.0 Summary: Binary files of jadetex Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +Obsoletes: texlive-bin-jadetex < %{texlive_version} Prefix: %{_bindir} %description jadetex-bin @@ -4793,6 +4801,7 @@ License: LPPL-1.0 Summary: Binary files of latex-bin Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +Obsoletes: texlive-bin-latex < %{texlive_version} Prefix: %{_bindir} %description latex-bin-bin @@ -4949,6 +4958,7 @@ License: LPPL-1.0 Summary: Binary files of metapost Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +Obsoletes: texlive-bin-metapost < %{texlive_version} Prefix: %{_bindir} %description metapost-bin @@ -5045,6 +5055,7 @@ License: LPPL-1.0 Summary: Binary files of musixtex Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +Obsoletes: texlive-bin-musictex < %{texlive_version} Prefix: %{_bindir} %description musixtex-bin @@ -5057,6 +5068,7 @@ License: LPPL-1.0 Summary: Binary files of omegaware Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +Obsoletes: texlive-bin-omega < %{texlive_version} Prefix: %{_bindir} %description omegaware-bin @@ -5333,6 +5345,7 @@ License: LPPL-1.0 Summary: Binary files of tex4ht Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +Obsoletes: texlive-bin-tex4ht < %{texlive_version} Prefix: %{_bindir} %description tex4ht-bin @@ -5597,6 +5610,7 @@ License: LPPL-1.0 Summary: Binary files of xetex Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +Obsoletes: texlive-bin-xetex < %{texlive_version} Prefix: %{_bindir} %description xetex-bin @@ -5609,6 +5623,7 @@ License: LPPL-1.0 Summary: Binary files of xmltex Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +Obsoletes: texlive-bin-xmltex < %{texlive_version} Prefix: %{_bindir} %description xmltex-bin @@ -6040,7 +6055,7 @@ TeX by ASCII Co.) and its surrounding tools. %{perl_privlib}/Unicode/Collate/allkeys.txt;lib/Unicode/Collate/allkeys.txt %{perl_privlib}/Unicode/Collate/keys.txt;lib/Unicode/Collate/keys.txt EOF - LD_LIBRARY_PATH=/lib64:/usr/lib64 \ + LD_LIBRARY_PATH=/%{_lib}:%{_libdir} \ pp -I lib --dependent \ --compress=7 \ --module=deprecate \ @@ -6076,6 +6091,7 @@ TeX by ASCII Co.) and its surrounding tools. --cachedeps=scancache \ --output=${prefix}/bin/biber \ script/biber + install -m 0644 bindoc/biber.1 ${prefix}/share/man/man1/ popd popd %endif @@ -12753,6 +12769,11 @@ TeX by ASCII Co.) and its surrounding tools. pushd ${prefix}/include/ tar -cspSf - . | tar -xvspSf - -C %{buildroot}%{_includedir}/ popd +%if %{with buildbiber} + pushd ${prefix}/share/man/ + install -m 0644 man1/biber.1 %{buildroot}%{_mandir}/man1/ + popd +%endif # # Those lines with exclamation mark have to done in the # specific spec files @@ -20517,6 +20538,9 @@ fi %files biber-bin %defattr(-,root,root,755) %{_bindir}/biber +%if %{with buildbiber} +%{_mandir}/man1/biber.1* +%endif %files bibexport-bin %defattr(-,root,root,755)