From d1717b7748fae12070df92d3031ee616980969f7 Mon Sep 17 00:00:00 2001 From: Petr Kovar Date: Mar 23 2014 17:57:35 +0000 Subject: More Fedora updates --- diff --git a/en-US/Advanced_Topics.xml b/en-US/Advanced_Topics.xml index fe27ab6..c7df88a 100644 --- a/en-US/Advanced_Topics.xml +++ b/en-US/Advanced_Topics.xml @@ -19,11 +19,11 @@ - The functionality described in this section is not available in Red Hat Enterprise Linux 5 and 6. + The functionality described in this section is not available in Enterprise Linux 5 and 6. - RPM in Red Hat Enterprise Linux 7 features support for automatic Provides and Requires and filtering. For example, for all Python libraries, RPM automatically adds the following Requires: + RPM in Fedora and Enterprise Linux 7 features support for automatic Provides and Requires and filtering. For example, for all Python libraries, RPM automatically adds the following Requires: Requires: python(abi) = (version) @@ -208,10 +208,10 @@ $ rpm -ql mysql-libs | grep 'lib.*so' In general, unless absolutely necessary, &DSCL; packages should not provide any symbols that are already provided by packages from the base system installation. One exception to that rule is when you want to use the symbols in the packages from the base system installation. -
- &DSCL; Library Support in Red Hat Enterprise Linux 7 +
+ &DSCL; Library Support in Fedora and Enterprise Linux 7 - When building your &DSCL; for Red Hat Enterprise Linux 7, use the %__provides_exclude_from macro to prevent scanning certain files for automatically generated RPM symbols. + When building your &DSCL; for Fedora or Enterprise Linux 7, use the %__provides_exclude_from macro to prevent scanning certain files for automatically generated RPM symbols. For example, to prevent scanning .so files in the %{_libdir} directory, add the following lines before the BuildRequires or Requires tags in your &DSCL; spec file: @@ -391,118 +391,20 @@ install -p -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{?scl:%_root_sysconfdir}%{!?scl: restorecon -R -v /&OPT;/&RH;/software_collection_1/root/usr The commands above ensure that all directories and files in the /&OPT;/&RH;/software_collection_1/root/usr/ directory are labeled by SELinux as if they were located in the /usr/ directory. -
- SELinux Support in Red Hat Enterprise Linux 7 - When packaging a &DSCL; for Red Hat Enterprise Linux 7, add the following commands to the %post section in the &DSCL; metapackage to set up the SELinux labels: +
+ SELinux Support in Fedora and Enterprise Linux 7 + When packaging a &DSCL; for Fedora or Enterprise Linux 7, add the following commands to the %post section in the &DSCL; metapackage to set up the SELinux labels: semanage fcontext -a -e /usr /&OPT;/&RH;/software_collection_1/root/usr restorecon -R -v /&OPT;/&RH;/software_collection_1/root/usr selinuxenabled && load_policy || : The last command ensures that the newly created SELinux policy is properly loaded, and that the files installed by a package in the &DSCL; are created with the correct SELinux context. By using this command in the metapackage, you do not need to include the restorecon command in all packages in the &DSCL;. Note that the semanage fcontext command is provided by the policycoreutils-python package, therefore it is important that you include policycoreutils-python in Requires for the &DSCL; metapackage.
-
- SELinux Support in Red Hat Enterprise Linux 5 +
+ SELinux Support in Enterprise Linux 5 - Keep in mind that the semanage -e command, which substitutes the source path for the destination path during labeling, is not supported in Red Hat Enterprise Linux 5. + Keep in mind that the semanage -e command, which substitutes the source path for the destination path during labeling, is not supported in Enterprise Linux 5.
- diff --git a/en-US/Introducing_Software_Collections.xml b/en-US/Introducing_Software_Collections.xml index 3360a3d..ded0c2b 100644 --- a/en-US/Introducing_Software_Collections.xml +++ b/en-US/Introducing_Software_Collections.xml @@ -5,7 +5,7 @@ This chapter introduces you to the concept and usage of &DSCL;s or &DSC;s for short.
Why Package Software with RPM? - The RPM Package Manager (RPM) is a package management system that runs on &MAJOROS;. RPM makes it easier for you to distribute, manage, and update software that you create for &MAJOROS;. Many software vendors distribute their software via a conventional archive file (such as a tarball). However, there are several advantages in packaging software into RPM packages. These advantages are outlined below. + The RPM Package Manager (RPM) is a package management system that runs on &MAJOROS;. RPM makes it easier for you to distribute, manage, and update software that you create for Fedora or Enterprise Linux. Many software vendors distribute their software via a conventional archive file (such as a tarball). However, there are several advantages in packaging software into RPM packages. These advantages are outlined below. With RPM, you can: diff --git a/en-US/Packaging_Software_Collections.xml b/en-US/Packaging_Software_Collections.xml index dc9f4e0..bcc36ba 100644 --- a/en-US/Packaging_Software_Collections.xml +++ b/en-US/Packaging_Software_Collections.xml @@ -273,7 +273,7 @@ EOF %files -%files runtime +%files runtime -f filesystem %scl_files %files build diff --git a/en-US/Software_Collections_Guide.ent b/en-US/Software_Collections_Guide.ent index 617803c..a8832b4 100644 --- a/en-US/Software_Collections_Guide.ent +++ b/en-US/Software_Collections_Guide.ent @@ -1,7 +1,7 @@ - + diff --git a/en-US/Software_Collections_Guide.xml b/en-US/Software_Collections_Guide.xml index 26e7b5f..7c6ae82 100644 --- a/en-US/Software_Collections_Guide.xml +++ b/en-US/Software_Collections_Guide.xml @@ -12,8 +12,8 @@ xmlns:xi="http://www.w3.org/2001/XInclude" /> - +