[redhat-lsb/f18] Various changes from Rawhide

[Ondrej Vasik]

commit 5ef36c65123ed3e99acf67014b79c1b743a9fac3
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Wed Jan 16 15:41:48 2013 +0100

    Various changes from Rawhide

 redhat-lsb.spec |   58 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 52 insertions(+), 6 deletions(-)
---
diff --git a/redhat-lsb.spec b/redhat-lsb.spec
index 9e7421c..36fe136 100644
--- a/redhat-lsb.spec
+++ b/redhat-lsb.spec
@@ -43,7 +43,7 @@
 Summary: Implementation of Linux Standard Base specification
 Name: redhat-lsb
 Version: 4.1
-Release: 5%{?dist}
+Release: 10%{?dist}
 URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: https://fedorahosted.org/releases/r/e/redhat-lsb/%{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
@@ -177,7 +177,6 @@ Requires: /bin/sh
 Requires: /bin/sleep
 Requires: /bin/sort
 Requires: /bin/stty
-Requires: /bin/su
 Requires: /bin/sync
 Requires: /bin/tar
 Requires: /bin/touch
@@ -252,6 +251,7 @@ Requires: /usr/bin/seq
 Requires: /usr/bin/split
 Requires: /usr/bin/strings
 Requires: /usr/bin/strip
+Requires: /usr/bin/su
 Requires: /usr/bin/tail
 Requires: /usr/bin/tee
 Requires: /usr/bin/test
@@ -319,10 +319,10 @@ Requires: cairo%{?_isa}
 Requires: freetype%{?_isa}
 Requires: libjpeg-turbo%{?_isa}
 
-%ifarch %{ix86}
+%ifarch %{ix86} ppc s390
 Requires: libpng12.so.0
 %endif
-%ifarch x86_64
+%ifarch x86_64 ppc64 s390x
 Requires: libpng12.so.0()(64bit)
 %endif
 Requires: libpng%{?_isa}
@@ -376,6 +376,7 @@ Requires: perl(Test::Harness)
 Requires: perl(Test::Simple)
 Requires: perl(ExtUtils::MakeMaker)
 Requires: perl(Pod::Plainer)
+Requires: perl(XML::LibXML)
 
 # python
 Requires: /usr/bin/python
@@ -421,6 +422,19 @@ Provides: lsb-trialuse-noarch = %{version}
 The Linux Standard Base (LSB) Trialuse module support defines components
 which are not required parts of the LSB Specification.
 
+%package supplemental
+Group: System Environment/Base
+Summary: LSB supplemental dependencies required by LSB certification tests
+Requires: net-tools
+Requires: xorg-x11-fonts-ISO8859-1-75dpi
+Requires: xorg-x11-fonts-ISO8859-1-100dpi
+Requires: abattis-cantarell-fonts
+
+%description supplemental
+This subpackage brings in supplemental dependencies for components required for
+passing LSB (Linux Standard Base) certification testsuite, but not directly required
+to be on LSB conforming system.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -437,7 +451,7 @@ make
 if [ -e /bin/mailx ]; then
    if [ -L /bin/mailx ]; then
      rm -f /bin/mailx
-   fi 
+   fi
 fi
 
 %install
@@ -457,9 +471,13 @@ cd lsb-release-%{upstreamlsbrelver}
 make mandir=$RPM_BUILD_ROOT/%{_mandir} prefix=$RPM_BUILD_ROOT/%{_prefix} install
 cd ..
 # we keep more lsb information in /usr/share/lsb
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules   
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/modules
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/lsb/%{lsbrelver}/submodules
 
+#prepare installation of doc
+cp -p lsb-release-2.0/COPYING .
+cp -p lsb-release-2.0/README README.lsb_release
+
 # relations between modules and submodules
 modules="core cxx desktop languages printing trialuse"
 submodules="core perl python cpp toolkit-gtk toolkit-qt toolkit-qt3"
@@ -603,6 +621,8 @@ fi
 if [ $1 -eq 0 ];then
     if [ -e %{_datadir}/lsb/nsswitch.conf -a -e  %{_datadir}/lsb/nsswitch.conf.orig ];then
         if cmp -s %{_datadir}/lsb/nsswitch.conf /etc/nsswitch.conf;then
+            cp /etc/nsswitch.conf /etc/nsswitch.conf.rpmsave
+            echo "warning: /etc/nsswitch.conf saved as /etc/nsswitch.conf.rpmsave" >&2
             cat %{_datadir}/lsb/nsswitch.conf.orig >/etc/nsswitch.conf
         fi
         rm -f %{_datadir}/lsb/{nsswitch.conf,nsswitch.conf.orig}
@@ -662,6 +682,7 @@ os.remove("%{_datadir}/lsb")
 %{_datadir}/lsb/%{lsbrelver}/submodules/multimedia-%{lsbrelver}-noarch
 
 %files core
+%doc README README.lsb_release COPYING
 %{_sysconfdir}/redhat-lsb
 %dir %{_sysconfdir}/lsb-release.d
 %{_mandir}/*/*
@@ -721,8 +742,33 @@ os.remove("%{_datadir}/lsb")
 %{_sysconfdir}/lsb-release.d/trialuse*
 %{_datadir}/lsb/%{lsbrelver}/modules/trialuse
 
+%files supplemental
+#no files, just dependencies
+
 
 %changelog
+* Thu Jan 10 2013 Ondrej Vasik <ovasik at redhat.com> - 4.1-10
+- require abattis-cantarell-fonts in supplemental (#892998)
+
+* Fri Dec 14 2012 Ondrej Vasik <ovasik at redhat.com> - 4.1-9
+- ship README and COPYING file in -core subpackage
+  (#887195)
+
+* Wed Dec 12 2012 Ondrej Vasik <ovasik at redhat.com> - 4.1-8
+- require libpng12.so.0 in other architectures (#881596)
+
+* Wed Dec 05 2012 Ondrej Vasik <ovasik at redhat.com> - 4.1-7
+- add new subpackage -supplemental for LSB testuite-only dependencies
+- require net-tools in -supplemental (#882122)
+- require xorg-x11-fonts-ISO8859-1-{75,100}dpi in -supplemental
+  (#883385)
+- require perl(XML::LibXML) (#880954)
+- keep usermodified /etc/nsswitch.conf as /etc/nsswitch.conf.rpmsave,
+  warn about modification (#867124)
+
+* Mon Nov 05 2012 Parag <pnemade AT redhat DOT com> - 4.1-6
+- Resolves:rh#873066 - missing dependency /bin/su moved to /usr/bin/su
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild