rpms/texlive/devel texlive.spec,1.41,1.42

Jindrich Novy (jnovy) fedora-extras-commits at redhat.com
Mon Jun 23 12:01:52 UTC 2008 

Author: jnovy

Update of /cvs/extras/rpms/texlive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24772

Modified Files:
	texlive.spec 
Log Message:
* Mon Jun 23 2008 Jindrich Novy <jnovy at redhat.com> - 2007-34
- do not directly depend on restorecon and run it only if
  selinux is enabled



Index: texlive.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- texlive.spec	19 Jun 2008 13:23:59 -0000	1.41
+++ texlive.spec	23 Jun 2008 12:01:08 -0000	1.42
@@ -21,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	33%{?dist}
+Release:	34%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -138,8 +138,7 @@
 Requires:	texlive-texmf-errata = %{version}
 # make sure fonts package installed before running post - since
 # fmtutil-sys is symlink to fmtutil
-Requires(post):	%{_bindir}/fmtutil /sbin/restorecon
-Requires(preun,postun): /sbin/restorecon
+Requires(post):	%{_bindir}/fmtutil
 Provides:	tex(tex)
 Obsoletes:	tetex < 3.0-99
 Provides:	tetex = 3.0-99
@@ -168,7 +167,6 @@
 Provides:  tetex-afm = 3.0-99
 Requires: texlive-texmf-afm = %{version}
 Requires: texlive-texmf-errata = %{version}
-Requires(post,postun): /sbin/restorecon
 
 %description afm
 texlive-afm provides afm2tfm, a converter for PostScript(TM) font metric
@@ -221,7 +219,6 @@
 Requires: texlive = %{version}-%{release}
 Requires: texlive-texmf-xetex = %{version}
 Requires: dvipdfmx xdvipdfmx
-Requires(post,postun): /sbin/restorecon
 Provides: tex(xetex)
 
 %description xetex
@@ -242,7 +239,6 @@
 Requires: texlive-texmf-errata = %{version}
 Provides: tex(dvips)
 Requires: psutils
-Requires(post,postun): /sbin/restorecon
 
 %description dvips
 Dvips converts .dvi files, for example those produced by the TeX text
@@ -259,7 +255,6 @@
 Group: Applications/Publishing
 # not positive about this requires, pretty sure though
 Requires: texlive = %{version}-%{release}
-Requires(post,postun): /sbin/restorecon
 # used to be in tetex, but has a separate upstream
 Requires: dvipng dvipdfm
 # some dvi utilities used to be in tetex
@@ -277,7 +272,6 @@
 # make sure main and fonts package installed before running post
 Requires(post): %{_bindir}/fmtutil %{_bindir}/fmtutil-sys
 Requires(post): %{_bindir}/texconfig-sys /sbin/install-info
-Requires(post,preun,postun): /sbin/restorecon
 BuildRequires: ghostscript netpbm-progs
 Obsoletes: tetex < 3.0-99
 Obsoletes: tetex-latex < 3.0-99
@@ -302,7 +296,6 @@
 Requires: texlive-latex = %{version}-%{release}
 Requires: texlive-texmf-dvips = %{version}
 Requires: texlive-texmf-errata-east-asian = %{version}
-Requires(post,postun): /sbin/restorecon
 Requires: mendexk
 Obsoletes: texlive-japanese < 2007-20
 Provides: texlive-japanese = %{version}-%{release}
@@ -318,7 +311,6 @@
 Requires: texlive = %{version}-%{release}
 Requires: texlive-texmf-errata-context = %{version}
 Requires: ruby
-Requires(post,postun): /sbin/restorecon
 Provides: tex(context)
 
 %description context
@@ -329,7 +321,6 @@
 Group:   Development/Libraries
 Obsoletes: tetex-fonts < 3.0-99
 Requires: texlive = %{version}-%{release}
-Requires(post,preun,postun): /sbin/restorecon
 
 %description -n kpathsea
 Shared library needed by kpathsea and info files.
@@ -684,33 +675,45 @@
 [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/web2c.info.gz %{_infodir}/dir
 %{_bindir}/fmtutil-sys --all &> /dev/null
 %{_bindir}/updmap-sys --syncwithtrees &> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post afm
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post context
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post dvips
 [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/dvips.info.gz %{_infodir}/dir
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post dviutils
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post east-asian
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post latex
@@ -718,18 +721,24 @@
 %{_bindir}/texconfig-sys init &> /dev/null
 %{_bindir}/texconfig-sys rehash 2> /dev/null
 %{_bindir}/fmtutil-sys --all &> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post xetex
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post -n kpathsea
 /sbin/ldconfig
 [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/kpathsea.info.gz %{_infodir}/dir
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 
@@ -737,7 +746,9 @@
 if [ "$1" = 0 ]; then
   [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/web2c.info.gz %{_infodir}/dir
 fi
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %preun dvips
@@ -750,7 +761,9 @@
 if [ "$1" = 0 ]; then
   [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/latex.info.gz %{_infodir}/dir
 fi
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %preun -n kpathsea
@@ -758,52 +771,72 @@
 if [ "$1" = 0 ]; then
   [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/kpathsea.info.gz %{_infodir}/dir
 fi
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun afm
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun context
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun east-asian
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun dviutils
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun dvips
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun latex
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun xetex
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun -n kpathsea
 /sbin/ldconfig
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %files
@@ -1199,6 +1232,10 @@
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Mon Jun 23 2008 Jindrich Novy <jnovy at redhat.com> - 2007-34
+- do not directly depend on restorecon and run it only if
+  selinux is enabled
+
 * Thu Jun 19 2008 Jindrich Novy <jnovy at redhat.com> - 2007-33
 - platex belongs to texlive-east-asian otherwise it is a dangling
   symlink in texlive-latex

More information about the fedora-extras-commits mailing list