diff --git a/texlive-rpmlintrc b/texlive-rpmlintrc index 11eebb2..a295fd0 100644 --- a/texlive-rpmlintrc +++ b/texlive-rpmlintrc @@ -20,5 +20,5 @@ 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.*/etc/permissions.d/texlive.texmf.*") - +addFilter(".*permissions-unauthorized-file.*") +addFilter(".*obsolete-not-provided.*") diff --git a/texlive.spec b/texlive.spec index 7ad077b..7893649 100644 --- a/texlive.spec +++ b/texlive.spec @@ -17,7 +17,7 @@ %define texlive_version 2012 %define texlive_release 20120416 -%define texlive_noarch 11 +%define texlive_noarch 14 %define texlive_source texlive-20120416-source %define __perl_requires %{nil} @@ -81,6 +81,7 @@ BuildRequires: libpoppler-devel BuildRequires: ncurses-devel BuildRequires: netpbm BuildRequires: pango-devel +BuildRequires: pwdutils BuildRequires: readline-devel BuildRequires: t1lib BuildRequires: t1lib-devel @@ -242,7 +243,7 @@ Prefix: %{_bindir} %define _x11inc %{_includedir} %define _appdefdir %{_x11data}/app-defaults # -%define texgrp public +%define texgrp mktex #%define texgid 505 # %description @@ -727,8 +728,8 @@ Requires: texlive-tetex = %{texlive_version} Requires: texlive-tex = %{texlive_version} Requires: texlive-texconfig = %{texlive_version} Requires: texlive-xdvi = %{texlive_version} -Provides: tex(tex) Provides: tex(basic) +Provides: tex(tex) BuildArch: noarch %description collection-basic @@ -12851,7 +12852,7 @@ mkdir -p /var/run/texlive %{_texmfmaindir}/texconfig/update %pre filesystem -if test "$1" = 1 -a -z $(%{_bindir}/getent group %{texgrp} 2>/dev/null); then +if test "$1" = 1 -a -z "$(%{_bindir}/getent group %{texgrp} 2>/dev/null)"; then %{_sbindir}/groupadd -r %{?texgid:-g %texgid} %{texgrp} fi