rpms/texlive-texmf/F-9 texlive-texmf.spec,1.23,1.24

Jindrich Novy (jnovy) fedora-extras-commits at redhat.com
Mon May 5 17:26:36 UTC 2008


Author: jnovy

Update of /cvs/extras/rpms/texlive-texmf/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20865

Modified Files:
	texlive-texmf.spec 
Log Message:
* Mon May 05 2008 Jindrich Novy <jnovy at redhat.com> - 2007-21
- fix SELinux contexts everywhere possible, don't allow restorecon
  to fail (#444922)



Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/F-9/texlive-texmf.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- texlive-texmf.spec	7 Apr 2008 13:07:08 -0000	1.23
+++ texlive-texmf.spec	5 May 2008 17:25:58 -0000	1.24
@@ -12,7 +12,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	20%{?dist}
+Release:	21%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -62,6 +62,7 @@
 BuildRequires:  sed >= 3.95 ghostscript lzma
 
 Requires:	texlive-texmf-errata = %{version}
+Requires(post,preun,postun): /sbin/restorecon
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -79,6 +80,7 @@
 Summary:	Texmf files needed for texlive-afm
 Requires:	texlive-texmf = %{version}-%{release}
 Requires:	texlive-texmf-errata-afm = %{version}
+Requires(post,postun): /sbin/restorecon
 
 %description afm
 This package contains the components of the TEXMF tree needed for the
@@ -88,6 +90,7 @@
 Group:		Applications/Publishing
 Summary:	TeX documentation
 Requires:	texlive-texmf-errata-doc = %{version}
+Requires(post,postun): /sbin/restorecon
 Obsoletes:	tetex-doc < 3.0-99
 Provides:	tetex-doc = 3.0-99
 Obsoletes:	texlive-doc < 2007-7
@@ -103,6 +106,7 @@
 Summary:	Texmf files needed for texlive-dvips
 Requires:	texlive-texmf = %{version}-%{release}
 Requires:	texlive-texmf-errata-dvips = %{version}
+Requires(post,postun): /sbin/restorecon
 
 %description dvips
 This package contains the components of the TEXMF tree needed for the
@@ -115,6 +119,7 @@
 Requires:	texlive-texmf-dvips = %{version}-%{release}
 Requires:	texlive-texmf-errata-fonts = %{version}
 Requires(post): /sbin/restorecon coreutils
+Requires(postun): /sbin/restorecon
 
 %description fonts
 This package contains the components of the TEXMF tree needed for the
@@ -125,6 +130,7 @@
 Summary:	Texmf files needed for texlive-latex
 Requires:	texlive-texmf = %{version}-%{release}
 Requires:	texlive-texmf-errata-latex = %{version}
+Requires(post,postun): /sbin/restorecon
 %if !%{f8_packaging}
 Requires:	tex-preview
 %else
@@ -140,6 +146,7 @@
 Summary:	Texmf files needed for texlive-xetex
 Requires:	texlive-texmf = %{version}-%{release}
 Requires:	texlive-texmf-errata-xetex = %{version}
+Requires(post,postun): /sbin/restorecon
 
 %description xetex
 This package contains the components of the TEXMF tree needed for the
@@ -149,6 +156,7 @@
 Group:		Applications/Publishing
 Summary:	Texmf files needed for texlive-east-asian
 Requires:	texlive-texmf = %{version}-%{release}
+Requires(post,postun): /sbin/restorecon
 Obsoletes:	texlive-texmf-japanese < 2007-14
 Provides:	texlive-texmf-japanese = %{version}-%{release}
 
@@ -160,6 +168,7 @@
 Summary:	Texmf files needed for ConTeXt
 Requires:	texlive-texmf = %{version}-%{release}
 Requires:	texlive-texmf-errata-context = %{version}
+Requires(post,postun): /sbin/restorecon
 
 %description context
 This package contains the components of the TEXMF tree needed for the
@@ -429,73 +438,110 @@
 rm -rf %{buildroot}
 
 %post
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
-[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/tds.info.gz %{_infodir}/dir || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/tds.info.gz %{_infodir}/dir
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %post afm
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %post dvips
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %post fonts
 # done in fonts because fonts package owns texhash
 #  this is really only needed for build system
 if [ ! -x %{_bindir}/texhash ]; then
-  cat %{_texmf_main}/default.ls-R > %{_texmf_main}/ls-R ||:
-  cat %{_texmf_var}/default.ls-R  > %{_texmf_var}/ls-R  ||:
+  cat %{_texmf_main}/default.ls-R > %{_texmf_main}/ls-R
+  cat %{_texmf_var}/default.ls-R  > %{_texmf_var}/ls-R
 else
-  [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+  [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
 fi
-/sbin/restorecon -R %{_texmf_var}/
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %post latex
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %post xetex
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %post doc
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %post east-asian
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %post context
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %preun
 if [ "$1" = 0 ]; then
-  [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/tds.info.gz %{_infodir}/dir || :
+  [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/tds.info.gz %{_infodir}/dir
 fi
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 
 %postun
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %postun afm
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %postun dvips
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %postun fonts
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %postun latex
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %postun xetex
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %postun doc
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %postun east-asian
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %postun context
-[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+:
 
 %files
 %defattr(-,root,root,-)
@@ -749,6 +795,10 @@
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Mon May 05 2008 Jindrich Novy <jnovy at redhat.com> - 2007-21
+- fix SELinux contexts everywhere possible, don't allow restorecon
+  to fail (#444922)
+
 * Mon Apr 07 2008 Jindrich Novy <jnovy at redhat.com> - 2007-20
 - mark dvips config files %%config(noreplace) (#441171)
 




More information about the fedora-extras-commits mailing list