Attachment 313075 Details for Bug 226363 – CVS diff for redhat-lsb.spec

CVS diff for redhat-lsb.spec

cvs_diff (text/plain), 19.72 KB, created by Hao Liu on 2008-07-31 07:31:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hao Liu

Created: 2008-07-31 07:31:58 UTC

Size: 19.72 KB

patch

obsolete

>? cvs_diff
>Index: redhat-lsb.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/redhat-lsb/devel/redhat-lsb.spec,v
>retrieving revision 1.36
>diff -u -p -r1.36 redhat-lsb.spec
>--- redhat-lsb.spec	30 Jul 2008 15:19:36 -0000	1.36
>+++ redhat-lsb.spec	31 Jul 2008 07:29:11 -0000
>@@ -44,22 +44,20 @@
> 
> %define upstreamlsbrelver 2.0
> %define lsbrelver 3.0
>-%define srcrelease 5
>+%define srcrelease 4
> 
> Summary: LSB support for Red Hat Linux
> Name: redhat-lsb
>-Version: 3.1
>-Release: 21%{?dist}
>-URL: http://www.linuxbase.org/
>+Version: 3.2
>+Release: 1.f9
>+URL: http://www.linux-foundation.org/
> Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
> Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz
> Patch0: lsb-release-2.0-disable-etc-lsb-release.patch
> Patch1: lsb-release-3.1-update-init-functions.patch
>-License: GPLv2
>+License: GPLv2 and GPLv2+ and LGPLv2
> Group: System Environment/Base
>-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-BuildRequires: perl, help2man
>-
>+BuildRoot: %{_tmppath}/%{name}-root
> # dependency for primary LSB application for v1.3
> Provides: lsb = %{version}
> # dependency for primary LSB application for v2.0 and v3.0
>@@ -93,120 +91,290 @@ ExclusiveArch: i386 ia64 x86_64 ppc ppc6
> 
> %ifarch %{ix86}
> # archLSB IA32 Base Libraries
>-Requires: libz.so.1
>-Requires: libutil.so.1
>-Requires: libpthread.so.0
>-Requires: libncurses.so.5
>-Requires: libm.so.6
>-Requires: libgcc_s.so.1
>-Requires: libdl.so.2
>-Requires: libcrypt.so.1
>+Requires: libatk-1.0.so.0
> Requires: libc.so.6
>+Requires: libcrypt.so.1
>+Requires: libdl.so.2
>+Requires: libgcc_s.so.1
>+Requires: libgdk-x11-2.0.so.0
>+Requires: libgdk_pixbuf-2.0.so.0
>+Requires: libgdk_pixbuf_xlib-2.0.so.0
>+Requires: libglib-2.0.so.0
>+Requires: libgmodule-2.0.so.0
>+Requires: libgobject-2.0.so.0
>+Requires: libgthread-2.0.so.0
>+Requires: libgtk-x11-2.0.so.0
>+Requires: libm.so.6
>+Requires: libncurses.so.5
>+Requires: libpango-1.0.so.0
>+Requires: libpangoft2-1.0.so.0
>+Requires: libpangoxft-1.0.so.0
>+Requires: libpthread.so.0
>+Requires: libqt-mt.so.3
>+Requires: libQtCore.so.4
>+Requires: libQtGui.so.4
>+Requires: libQtNetwork.so.4
>+Requires: libQtOpenGL.so.4
>+Requires: libQtSql.so.4
>+Requires: libQtSvg.so.4
>+Requires: libQtXml.so.4
> Requires: libstdc++.so.6
>+Requires: libutil.so.1
>+Requires: libz.so.1
> %endif
> 
> %ifarch ia64
> # archLSB IA64 Base Libraries
>-Requires: libz.so.1()(64bit)
>-Requires: libutil.so.1()(64bit)
>-Requires: libpthread.so.0()(64bit)
>-Requires: libncurses.so.5()(64bit)
>-Requires: libm.so.6.1()(64bit)
>-Requires: libgcc_s.so.1()(64bit)
>-Requires: libdl.so.2()(64bit)
>-Requires: libcrypt.so.1()(64bit)
>+Requires: libatk-1.0.so.0()(64bit)
> Requires: libc.so.6.1()(64bit)
>+Requires: libcrypt.so.1()(64bit)
>+Requires: libdl.so.2()(64bit)
>+Requires: libgcc_s.so.1()(64bit)
>+Requires: libgdk-x11-2.0.so.0()(64bit)
>+Requires: libgdk_pixbuf-2.0.so.0()(64bit)
>+Requires: libgdk_pixbuf_xlib-2.0.so.0()(64bit)
>+Requires: libglib-2.0.so.0()(64bit)
>+Requires: libgmodule-2.0.so.0()(64bit)
>+Requires: libgobject-2.0.so.0()(64bit)
>+Requires: libgthread-2.0.so.0()(64bit)
>+Requires: libgtk-x11-2.0.so.0()(64bit)
>+Requires: libm.so.6.1()(64bit)
>+Requires: libncurses.so.5()(64bit)
>+Requires: libpango-1.0.so.0()(64bit)
>+Requires: libpangoft2-1.0.so.0()(64bit)
>+Requires: libpangoxft-1.0.so.0()(64bit)
>+Requires: libpthread.so.0()(64bit)
>+Requires: libqt-mt.so.3()(64bit)
>+Requires: libQtCore.so.4()(64bit)
>+Requires: libQtGui.so.4()(64bit)
>+Requires: libQtNetwork.so.4()(64bit)
>+Requires: libQtOpenGL.so.4()(64bit)
>+Requires: libQtSql.so.4()(64bit)
>+Requires: libQtSvg.so.4()(64bit)
>+Requires: libQtXml.so.4()(64bit)
> Requires: libstdc++.so.6()(64bit)
>+Requires: libutil.so.1()(64bit)
>+Requires: libz.so.1()(64bit)
> %endif
> 
> %ifarch ppc
> # archLSB PPC32 Base Libraries
>-Requires: libz.so.1
>-Requires: libutil.so.1
>-Requires: libpthread.so.0
>-Requires: libncurses.so.5
>-Requires: libm.so.6
>-Requires: libgcc_s.so.1
>-Requires: libdl.so.2
>-Requires: libcrypt.so.1
>+Requires: libatk-1.0.so.0
> Requires: libc.so.6
>+Requires: libcrypt.so.1
>+Requires: libdl.so.2
>+Requires: libgcc_s.so.1
>+Requires: libgdk-x11-2.0.so.0
>+Requires: libgdk_pixbuf-2.0.so.0
>+Requires: libgdk_pixbuf_xlib-2.0.so.0
>+Requires: libglib-2.0.so.0
>+Requires: libgmodule-2.0.so.0
>+Requires: libgobject-2.0.so.0
>+Requires: libgthread-2.0.so.0
>+Requires: libgtk-x11-2.0.so.0
>+Requires: libm.so.6
>+Requires: libncurses.so.5
>+Requires: libpango-1.0.so.0
>+Requires: libpangoft2-1.0.so.0
>+Requires: libpangoxft-1.0.so.0
>+Requires: libpthread.so.0
>+Requires: libqt-mt.so.3
>+Requires: libQtCore.so.4
>+Requires: libQtGui.so.4
>+Requires: libQtNetwork.so.4
>+Requires: libQtOpenGL.so.4
>+Requires: libQtSql.so.4
>+Requires: libQtSvg.so.4
>+Requires: libQtXml.so.4
> Requires: libstdc++.so.6
>+Requires: libutil.so.1
>+Requires: libz.so.1
> %endif
> 
> %ifarch ppc64
> # archLSB PPC64 Base Libraries
>-Requires: libz.so.1()(64bit)
>-Requires: libutil.so.1()(64bit)
>-Requires: libpthread.so.0()(64bit)
>-Requires: libncurses.so.5()(64bit)
>-Requires: libm.so.6()(64bit)
>-Requires: libgcc_s.so.1()(64bit)
>-Requires: libdl.so.2()(64bit)
>-Requires: libcrypt.so.1()(64bit)
>+Requires: libatk-1.0.so.0()(64bit)
> Requires: libc.so.6()(64bit)
>+Requires: libcrypt.so.1()(64bit)
>+Requires: libdl.so.2()(64bit)
>+Requires: libgcc_s.so.1()(64bit)
>+Requires: libgdk-x11-2.0.so.0()(64bit)
>+Requires: libgdk_pixbuf-2.0.so.0()(64bit)
>+Requires: libgdk_pixbuf_xlib-2.0.so.0()(64bit)
>+Requires: libglib-2.0.so.0()(64bit)
>+Requires: libgmodule-2.0.so.0()(64bit)
>+Requires: libgobject-2.0.so.0()(64bit)
>+Requires: libgthread-2.0.so.0()(64bit)
>+Requires: libgtk-x11-2.0.so.0()(64bit)
>+Requires: libm.so.6()(64bit)
>+Requires: libncurses.so.5()(64bit)
>+Requires: libpango-1.0.so.0()(64bit)
>+Requires: libpangoft2-1.0.so.0()(64bit)
>+Requires: libpangoxft-1.0.so.0()(64bit)
>+Requires: libpthread.so.0()(64bit)
>+Requires: libqt-mt.so.3()(64bit)
>+Requires: libQtCore.so.4()(64bit)
>+Requires: libQtGui.so.4()(64bit)
>+Requires: libQtNetwork.so.4()(64bit)
>+Requires: libQtOpenGL.so.4()(64bit)
>+Requires: libQtSql.so.4()(64bit)
>+Requires: libQtSvg.so.4()(64bit)
>+Requires: libQtXml.so.4()(64bit)
> Requires: libstdc++.so.6()(64bit)
>+Requires: libutil.so.1()(64bit)
>+Requires: libz.so.1()(64bit)
> %endif
> 
> %ifarch s390
> # archLSB S390 Base Libraries
>-Requires: libz.so.1
>-Requires: libutil.so.1
>-Requires: libpthread.so.0
>-Requires: libncurses.so.5
>-Requires: libm.so.6
>-Requires: libgcc_s.so.1
>-Requires: libdl.so.2
>-Requires: libcrypt.so.1
>+Requires: libatk-1.0.so.0
> Requires: libc.so.6
>+Requires: libcrypt.so.1
>+Requires: libdl.so.2
>+Requires: libgcc_s.so.1
>+Requires: libgdk-x11-2.0.so.0
>+Requires: libgdk_pixbuf-2.0.so.0
>+Requires: libgdk_pixbuf_xlib-2.0.so.0
>+Requires: libglib-2.0.so.0
>+Requires: libgmodule-2.0.so.0
>+Requires: libgobject-2.0.so.0
>+Requires: libgthread-2.0.so.0
>+Requires: libgtk-x11-2.0.so.0
>+Requires: libm.so.6
>+Requires: libncurses.so.5
>+Requires: libpango-1.0.so.0
>+Requires: libpangoft2-1.0.so.0
>+Requires: libpangoxft-1.0.so.0
>+Requires: libpthread.so.0
>+Requires: libqt-mt.so.3
>+Requires: libQtCore.so.4
>+Requires: libQtGui.so.4
>+Requires: libQtNetwork.so.4
>+Requires: libQtOpenGL.so.4
>+Requires: libQtSql.so.4
>+Requires: libQtSvg.so.4
>+Requires: libQtXml.so.4
> Requires: libstdc++.so.6
>+Requires: libutil.so.1
>+Requires: libz.so.1
> %endif
> 
> %ifarch s390x
> # archLSB S390X Base Libraries
>-Requires: libz.so.1()(64bit)
>-Requires: libutil.so.1()(64bit)
>-Requires: libpthread.so.0()(64bit)
>-Requires: libncurses.so.5()(64bit)
>-Requires: libm.so.6()(64bit)
>-Requires: libgcc_s.so.1()(64bit)
>-Requires: libdl.so.2()(64bit)
>-Requires: libcrypt.so.1()(64bit)
>+Requires: libatk-1.0.so.0()(64bit)
> Requires: libc.so.6()(64bit)
>+Requires: libcrypt.so.1()(64bit)
>+Requires: libdl.so.2()(64bit)
>+Requires: libgcc_s.so.1()(64bit)
>+Requires: libgdk-x11-2.0.so.0()(64bit)
>+Requires: libgdk_pixbuf-2.0.so.0()(64bit)
>+Requires: libgdk_pixbuf_xlib-2.0.so.0()(64bit)
>+Requires: libglib-2.0.so.0()(64bit)
>+Requires: libgmodule-2.0.so.0()(64bit)
>+Requires: libgobject-2.0.so.0()(64bit)
>+Requires: libgthread-2.0.so.0()(64bit)
>+Requires: libgtk-x11-2.0.so.0()(64bit)
>+Requires: libm.so.6()(64bit)
>+Requires: libncurses.so.5()(64bit)
>+Requires: libpango-1.0.so.0()(64bit)
>+Requires: libpangoft2-1.0.so.0()(64bit)
>+Requires: libpangoxft-1.0.so.0()(64bit)
>+Requires: libpthread.so.0()(64bit)
>+Requires: libqt-mt.so.3()(64bit)
>+Requires: libQtCore.so.4()(64bit)
>+Requires: libQtGui.so.4()(64bit)
>+Requires: libQtNetwork.so.4()(64bit)
>+Requires: libQtOpenGL.so.4()(64bit)
>+Requires: libQtSql.so.4()(64bit)
>+Requires: libQtSvg.so.4()(64bit)
>+Requires: libQtXml.so.4()(64bit)
> Requires: libstdc++.so.6()(64bit)
>+Requires: libutil.so.1()(64bit)
>+Requires: libz.so.1()(64bit)
> %endif
> 
> %ifarch x86_64
> # archLSB AMD64 Base Libraries
>-Requires: libz.so.1()(64bit)
>-Requires: libutil.so.1()(64bit)
>-Requires: libpthread.so.0()(64bit)
>-Requires: libncurses.so.5()(64bit)
>-Requires: libm.so.6()(64bit)
>-Requires: libgcc_s.so.1()(64bit)
>-Requires: libdl.so.2()(64bit)
>-Requires: libcrypt.so.1()(64bit)
>+Requires: libatk-1.0.so.0()(64bit)
> Requires: libc.so.6()(64bit)
>+Requires: libcrypt.so.1()(64bit)
>+Requires: libdl.so.2()(64bit)
>+Requires: libgcc_s.so.1()(64bit)
>+Requires: libgdk-x11-2.0.so.0()(64bit)
>+Requires: libgdk_pixbuf-2.0.so.0()(64bit)
>+Requires: libgdk_pixbuf_xlib-2.0.so.0()(64bit)
>+Requires: libglib-2.0.so.0()(64bit)
>+Requires: libgmodule-2.0.so.0()(64bit)
>+Requires: libgobject-2.0.so.0()(64bit)
>+Requires: libgthread-2.0.so.0()(64bit)
>+Requires: libgtk-x11-2.0.so.0()(64bit)
>+Requires: libm.so.6()(64bit)
>+Requires: libncurses.so.5()(64bit)
>+Requires: libpango-1.0.so.0()(64bit)
>+Requires: libpangoft2-1.0.so.0()(64bit)
>+Requires: libpangoxft-1.0.so.0()(64bit)
>+Requires: libpthread.so.0()(64bit)
>+Requires: libqt-mt.so.3()(64bit)
>+Requires: libQtCore.so.4()(64bit)
>+Requires: libQtGui.so.4()(64bit)
>+Requires: libQtNetwork.so.4()(64bit)
>+Requires: libQtOpenGL.so.4()(64bit)
>+Requires: libQtSql.so.4()(64bit)
>+Requires: libQtSvg.so.4()(64bit)
>+Requires: libQtXml.so.4()(64bit)
> Requires: libstdc++.so.6()(64bit)
>+Requires: libutil.so.1()(64bit)
>+Requires: libz.so.1()(64bit)
> %endif
> 
> # gLSB Base/Utility/Stdc++/Graphics Libraries
>-Requires: libz.so.1%{qual}
>-Requires: libutil.so.1%{qual}
>-Requires: librt.so.1%{qual}
>-Requires: libpthread.so.0%{qual}
>-Requires: libpam.so.0%{qual}
>-Requires: libncurses.so.5%{qual}
>-Requires: libgcc_s.so.1%{qual}
>-Requires: libdl.so.2%{qual}
>+Requires: libasound.so.2%{qual}
>+Requires: libatk-1.0.so.0%{qual}
> Requires: libcrypt.so.1%{qual}
>+Requires: libcups.so.2%{qual}
>+Requires: libcupsimage.so.2%{qual}
>+Requires: libdl.so.2%{qual}
>+Requires: libfontconfig.so.1%{qual}
>+Requires: libfreetype.so.6%{qual}
>+Requires: libgcc_s.so.1%{qual}
>+Requires: libgdk-x11-2.0.so.0%{qual}
>+Requires: libgdk_pixbuf-2.0.so.0%{qual}
>+Requires: libgdk_pixbuf_xlib-2.0.so.0%{qual}
>+Requires: libGL.so.1%{qual}
>+Requires: libglib-2.0.so.0%{qual}
>+Requires: libgmodule-2.0.so.0%{qual}
>+Requires: libgobject-2.0.so.0%{qual}
>+Requires: libgthread-2.0.so.0%{qual}
>+Requires: libgtk-x11-2.0.so.0%{qual}
>+Requires: libICE.so.6%{qual}
>+Requires: libjpeg.so.62%{qual}
>+Requires: libncurses.so.5%{qual}
>+Requires: libpam.so.0%{qual}
>+Requires: libpango-1.0.so.0%{qual}
>+Requires: libpangoft2-1.0.so.0%{qual}
>+Requires: libpangoxft-1.0.so.0%{qual}
>+Requires: libpng12.so.0%{qual}
>+Requires: libpthread.so.0%{qual}
>+Requires: libqt-mt.so.3%{qual}
>+Requires: libQtCore.so.4%{qual}
>+Requires: libQtGui.so.4%{qual}
>+Requires: libQtNetwork.so.4%{qual}
>+Requires: libQtOpenGL.so.4%{qual}
>+Requires: libQtSql.so.4%{qual}
>+Requires: libQtSvg.so.4%{qual}
>+Requires: libQtXml.so.4%{qual}
>+Requires: librt.so.1%{qual}
>+Requires: libSM.so.6%{qual}
> Requires: libstdc++.so.6%{qual}
>-Requires: libXt.so.6%{qual}
>-Requires: libXi.so.6%{qual}
>-Requires: libXext.so.6%{qual}
>+Requires: libutil.so.1%{qual}
> Requires: libX11.so.6%{qual}
>-Requires: libSM.so.6%{qual}
>-Requires: libICE.so.6%{qual}
>-Requires: libGL.so.1%{qual}
>+Requires: libXext.so.6%{qual}
>+Requires: libXft.so.2%{qual}
>+Requires: libXi.so.6%{qual}
>+Requires: libxml2.so.2%{qual}
>+Requires: libXrender.so.1%{qual}
>+Requires: libXt.so.6%{qual}
>+Requires: libz.so.1%{qual}
> 
> # gLSB Command and Utilities
> Requires: /bin/awk
>@@ -260,6 +428,7 @@ Requires: /bin/touch
> Requires: /bin/true
> Requires: /bin/umount
> Requires: /bin/uname
>+Requires: /bin/zcat
> Requires: /sbin/fuser
> Requires: /sbin/pidof
> Requires: /sbin/shutdown
>@@ -281,12 +450,17 @@ Requires: /usr/bin/dirname
> Requires: /usr/bin/du
> Requires: /usr/bin/expand
> Requires: /usr/bin/expr
>+Requires: /usr/bin/fc-cache
>+Requires: /usr/bin/fc-list
>+Requires: /usr/bin/fc-match
> Requires: /usr/bin/file
> Requires: /usr/bin/find
> Requires: /usr/bin/fold
>+Requires: /usr/bin/foomatic-rip
> Requires: /usr/bin/gencat
> Requires: /usr/bin/getconf
> Requires: /usr/bin/groups
>+Requires: /usr/bin/gs
> Requires: /usr/bin/head
> Requires: /usr/bin/iconv
> Requires: /usr/bin/id
>@@ -316,8 +490,10 @@ Requires: /usr/bin/paste
> Requires: /usr/bin/patch
> Requires: /usr/bin/pathchk
> Requires: /usr/bin/pax
>+Requires: /usr/bin/perl
> Requires: /usr/bin/pr
> Requires: /usr/bin/printf
>+Requires: /usr/bin/python
> Requires: /usr/bin/renice
> Requires: /usr/bin/split
> Requires: /usr/bin/strip
>@@ -332,8 +508,6 @@ Requires: /usr/bin/unexpand
> Requires: /usr/bin/uniq
> Requires: /usr/bin/wc
> Requires: /usr/bin/xargs
>-Requires: %{_libdir}/lsb/install_initd
>-Requires: %{_libdir}/lsb/remove_initd
> Requires: /usr/sbin/groupadd
> Requires: /usr/sbin/groupdel
> Requires: /usr/sbin/groupmod
>@@ -343,10 +517,10 @@ Requires: /usr/sbin/userdel
> Requires: /usr/sbin/usermod
> 
> %description
>-The Linux Standards Base (LSB) is an attempt to develop a set of
>+The Linux Standard Base (LSB) is an attempt to develop a set of
> standards that will increase compatibility among Linux distributions.
> The redhat-lsb package provides utilities needed for LSB Compliant
>-Applications. It also contains requirements that will ensure all
>+Applications.  It also contains requirements that will ensure that all
> components required by the LSB that are provided by Red Hat Linux are
> installed on the system.
> 
>@@ -361,17 +535,23 @@ make
> 
> %install
> rm -rf $RPM_BUILD_ROOT
>-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT%{_mandir} \
>-         $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libdir}/lsb \
>-         $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/ $RPM_BUILD_ROOT%{_sbindir}
>+# LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS
>+mkdir -p $RPM_BUILD_ROOT/etc $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT/%{_mandir} \
>+         $RPM_BUILD_ROOT/%{_bindir} $RPM_BUILD_ROOT/usr/lib/lsb \
>+         $RPM_BUILD_ROOT/etc/lsb-release.d/ $RPM_BUILD_ROOT/usr/sbin/
> make DESTDIR=$RPM_BUILD_ROOT install
> cd lsb-release-%{upstreamlsbrelver}
> make mandir=$RPM_BUILD_ROOT/%{_mandir} prefix=$RPM_BUILD_ROOT/%{_prefix} install
> cd ..
>-touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/core-3.1-%{archname}
>-touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/core-3.1-noarch
>-touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/graphics-3.1-%{archname}
>-touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/graphics-3.1-noarch
>+touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.2-%{archname}
>+touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.2-noarch
>+touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-3.2-%{archname}
>+touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-3.2-noarch
>+# and claim LSB 3.1 is supported as well
>+touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.1-%{archname}
>+touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.1-noarch
>+touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-3.1-%{archname}
>+touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-3.1-noarch
> 
> for LSBVER in %{lsbsover}; do
>   ln -s %{ldso} $RPM_BUILD_ROOT/%{_lib}/%{lsbldso}.$LSBVER
>@@ -379,14 +559,20 @@ done
> 
> mkdir -p $RPM_BUILD_ROOT/bin
> 
>-ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT%{_libdir}/lsb/install_initd
>-ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT%{_libdir}/lsb/remove_initd
>-#ln -snf mail $RPM_BUILD_ROOT/bin/mailx
>+# LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS
>+ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/install_initd
>+ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd
>+ln -snf mail $RPM_BUILD_ROOT/bin/mailx
>+
>+#mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xserver
>+#ln -snf /usr/%{_lib}/xserver/SecurityPolicy $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xserver/SecurityPolicy
>+#ln -snf /usr/share/X11/fonts $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts
>+#ln -snf /usr/share/X11/rgb.txt  $RPM_BUILD_ROOT/usr/X11R6/lib/X11/rgb.txt
> 
>-gcc $RPM_OPT_FLAGS -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
>+gcc -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
>   -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE
> install -m 700 redhat_lsb_trigger.%{_target_cpu} \
>-  $RPM_BUILD_ROOT%{_sbindir}/redhat_lsb_trigger.%{_target_cpu}
>+  $RPM_BUILD_ROOT/usr/sbin/redhat_lsb_trigger.%{_target_cpu}
> 
> cp redhat_lsb_init $RPM_BUILD_ROOT/bin/redhat_lsb_init
> 
>@@ -423,48 +609,44 @@ fi
> %endif
> 
> %files
>+#/usr/X11R6/lib/X11/fonts
>+#/usr/X11R6/lib/X11/rgb.txt
> %defattr(-,root,root)
>-%doc README
>-%{_sysconfdir}/redhat-lsb
>-%dir %{_sysconfdir}/lsb-release.d
>-%{_sysconfdir}/lsb-release.d/*
>+/etc/redhat-lsb
>+#%config /etc/lsb-release
>+#/etc/redhat-lsb
>+%dir /etc/lsb-release.d
>+/etc/lsb-release.d/*
>+#%dir /usr/X11R6/lib/X11/xserver
>+#/usr/X11R6/lib/X11/xserver/*
> %{_mandir}/*/*
> %{_bindir}/*
>-#/bin/mailx
>+/bin/mailx
> /bin/redhat_lsb_init
>-%{_libdir}/lsb
>-/%{_lib}/*
>+/usr/lib/lsb
> /lib/lsb
>-%{_sbindir}/redhat_lsb_trigger.%{_target_cpu}
>+/%{_lib}/*
>+/usr/sbin/redhat_lsb_trigger.%{_target_cpu}
>+#/usr/X11R6/lib/X11/xserver/SecurityPolicy
>+#/usr/X11R6/lib/X11/fonts
>+#/usr/X11R6/lib/X11/rgb.txt
> 
> %changelog
>-* Thu Jul 31 2009 Lawrence Lim <llim@redhat.com> - 3.1-21
>-- remove symlink for mailx (Bug #457241)
>-
>-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.1-20
>-- Autorebuild for GCC 4.3
>-
>-* Wed Oct 3 2007 Lawrence Lim <llim@redhat.com> - 3.1-19
>-- fix build issue on ppc - (.opd+0x10): multiple definition of `__libc_start_main'
>+* Wed Apr 16 2008 Mats Wichmann <mats@freestandards.org> 3.2-1
>+- port forward to LSB 3.2
> 
>-* Fri Sep 21 2007 Lawrence Lim <llim@redhat.com> - 3.1-18
>-- fix build issue in minimal build root (Bug #265241)
>-
>-* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.1-17
>-- Rebuild for selinux ppc32 issue.
>-
>-* Fri Aug 20 2007 Lawrence Lim <llim@redhat.com> - 3.1-16
>-- update spec file in accordance to feedback provided through merge review - merge-review.patch - #226363
>-
>-* Wed Jul 18 2007 Lawrence Lim <llim@redhat.com> - 3.1-15.f8
>+* Wed Jul 18 2007 Lawrence <llim@redhat.com> - 3.1-13.f8
> - Resolved: #239842 - /lib/lsb/init-functions shall use aliases but not functions
>-- forward port the patch from 3.1-12.3.EL which fix #217566, #233530, #240916
>-
>-* Wed May 2 2007 Lawrence Lim <llim@redhat.com> - 3.1-14.fc7
>-- fixed Bug 232918 for new glibc version
>+- forward port the patch from 3.1-12.3.EL
> 
>-* Wed Feb 21 2007 Lawrence Lim <llim@redhat.com> - 3.1-13
>-- fixed Bug 226363
>+* Tue Jun 26 2007 Lawrence Lim <llim@redhat.com> - 3.1-12.3.EL
>+- Resolves: #217566 - rewrite /lib/lsb/init-functions file needs to define the commands as true shell functions rather than aliases.
>+- Resolves: #233530 - LSB pidofproc misspelled as pidofprof.
>+- Resolves: #240916 - "log_warning_message" replaced with "log_warning_msg" per the LSB 3.1 spec
>+
>+* Wed Dec 6 2006 Lawrence Lim <llim@redhat.com> - 3.1-12.2.EL
>+- Resolves: bug 217566
>+- revise patch
> 
> * Wed Nov 29 2006 Lawrence Lim <llim@redhat.com> - 3.1-12
> - replaced aliases with functions in /lib/lsb/init-functions; Bug 217566
>@@ -543,7 +725,7 @@ fi
> 
> * Fri Jan 21 2005 Leon Ho <llch@redhat.com> 1.3-7
> - Add to support multiple LSB test suite version
>-- Add %endif in trigger postun
>+- Add endif in trigger postun
> 
> * Thu Nov 11 2004 Phil Knirsch <pknirsch@redhat.com> 1.3-6
> - Fixed invalid sln call for trigger in postun on ia64 (#137647)

Actions: View

Attachments on bug 226363: 147862 | 153923 | 161430 | 310415 | 311133 | 311542 | 311552 | 312117 | 313075