diff --git a/redhat-lsb-trigger.patch b/redhat-lsb-trigger.patch new file mode 100644 index 0000000..9ed3786 --- /dev/null +++ b/redhat-lsb-trigger.patch @@ -0,0 +1,114 @@ +--- redhat_lsb_trigger.c.jj 2008-04-16 19:50:14.000000000 +0200 ++++ redhat_lsb_trigger.c 2009-10-26 19:51:12.886058784 +0100 +@@ -423,10 +423,76 @@ is_ia64 (void) + #define is_ia64() 0 + #endif + ++char * ++strtok (char *p, const char *delim) ++{ ++ static char *olds; ++ const char *d; ++ char *token; ++ if (p == NULL) ++ p = olds; ++ while (*p) ++ { ++ for (d = delim; *d; d++) ++ if (*p == *d) ++ break; ++ if (!*d) ++ break; ++ p++; ++ } ++ if (!*p) ++ { ++ olds = p; ++ return NULL; ++ } ++ token = p; ++ while (*p) ++ { ++ for (d = delim; *d; d++) ++ if (*p == *d) ++ break; ++ if (*d) ++ break; ++ p++; ++ } ++ if (!*p) ++ olds = p; ++ else ++ { ++ *p = '\0'; ++ olds = p + 1; ++ } ++ return token; ++} ++ ++size_t ++strlen (const char *s) ++{ ++ const char *p; ++ for (p = s; *p; ++p); ++ return p - s; ++} ++ ++void * ++mempcpy (void *dst, const void *src, size_t n) ++{ ++ char *d = dst; ++ const char *s = src; ++ while (n--) ++ *d++ = *s++; ++ return d; ++} ++ ++char * ++strcpy (char *dst, const char *src) ++{ ++ char *ret = dst; ++ while ((*dst++ = *src++) != '\0'); ++ return ret; ++} ++ + int main (int argc, char **argv) + { +-/* redhat_lsb_trigger.c:428: warning: unused variable 'ret' */ +-/* long ret; */ + INTERNAL_SYSCALL_DECL (err); + char lsbsover[] = LSBSOVER; + char *LSBVER, *p = lsbsover; +@@ -455,11 +521,18 @@ void __libc_csu_fini (void) { } + pid_t __fork (void) { return -1; } + char thr_buf[65536]; + ++void ++__attribute__ ((noreturn)) ++__stack_chk_fail (void) ++{ ++ INTERNAL_SYSCALL_DECL (err); ++ while (1) ++ INTERNAL_SYSCALL (exit, err, 1, 1); ++} ++ + #ifndef __powerpc__ + +-/* /usr/lib/gcc/ppc64-redhat-linux/4.1.2/../../../../lib64/libc.a(libc-start.o): In function `__libc_start_main': +- * * (.opd+0x10): multiple definition of `__libc_start_main' */ +-int ___libc_start_main (int (*main) (int argc, char **argv), ++int __libc_start_main (int (*main) (int argc, char **argv), + int argc, char **argv, + void (*init) (void), void (*fini) (void), + void (*rtld_fini) (void), void * stack_end) +@@ -472,9 +545,7 @@ struct startup_info + void (*fini) (void); + }; + +-/* /usr/lib/gcc/ppc64-redhat-linux/4.1.2/../../../../lib64/libc.a(libc-start.o): In function `__libc_start_main': +- * (.opd+0x10): multiple definition of `__libc_start_main' */ +-int ___libc_start_main (int argc, char **argv, char **ev, ++int __libc_start_main (int argc, char **argv, char **ev, + void *auxvec, void (*rtld_fini) (void), + struct startup_info *stinfo, + char **stack_on_entry) diff --git a/redhat-lsb.spec b/redhat-lsb.spec index a496c66..5e84bab 100644 --- a/redhat-lsb.spec +++ b/redhat-lsb.spec @@ -43,20 +43,21 @@ %endif %define upstreamlsbrelver 2.0 -%define lsbrelver 3.0 +%define lsbrelver 4.0 %define srcrelease 1 -Summary: LSB support for Red Hat Linux +Summary: LSB base libraries support for Red Hat Enterprise Linux Name: redhat-lsb -Version: 3.2 -Release: 6%{?dist} +Version: 4.0 +Release: 3%{?dist} URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb Source0: %{name}-%{version}-%{srcrelease}.tar.bz2 +#Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz Patch0: lsb-release-3.1-update-init-functions.patch Patch1: redhat-lsb-lsb_start_daemon-fix.patch -License: GPLv2 +Patch2: redhat-lsb-trigger.patch +License: GPL Group: System Environment/Base -BuildRoot: %{_tmppath}/%{name}-root BuildRequires: glibc-static # dependency for primary LSB application for v1.3 Provides: lsb = %{version} @@ -83,41 +84,19 @@ Provides: lsb = %{version} %define archname amd64 %endif Provides: lsb-core-%{archname} = %{version} -Provides: lsb-graphics-%{archname} = %{version} Provides: lsb-core-noarch = %{version} -Provides: lsb-graphics-noarch = %{version} ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %ifarch %{ix86} # archLSB IA32 Base Libraries -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 @@ -125,33 +104,13 @@ Requires: libz.so.1 %ifarch ia64 # archLSB IA64 Base Libraries -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) @@ -159,33 +118,13 @@ Requires: libz.so.1()(64bit) %ifarch ppc # archLSB PPC32 Base Libraries -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 @@ -193,33 +132,13 @@ Requires: libz.so.1 %ifarch ppc64 # archLSB PPC64 Base Libraries -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) @@ -227,33 +146,13 @@ Requires: libz.so.1()(64bit) %ifarch s390 # archLSB S390 Base Libraries -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 @@ -261,33 +160,13 @@ Requires: libz.so.1 %ifarch s390x # archLSB S390X Base Libraries -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) @@ -295,85 +174,31 @@ Requires: libz.so.1()(64bit) %ifarch x86_64 # archLSB AMD64 Base Libraries -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: libasound.so.2%{qual} -Requires: libatk-1.0.so.0%{qual} +# gLSB Base/Utility/Stdc++ 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: libnspr4.so%{qual} +Requires: libnss3.so%{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: libssl3.so%{qual} Requires: libstdc++.so.6%{qual} Requires: libutil.so.1%{qual} -Requires: libX11.so.6%{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 @@ -396,6 +221,7 @@ Requires: /bin/egrep Requires: /bin/env Requires: /bin/false Requires: /bin/fgrep +Requires: /bin/find Requires: /bin/gettext Requires: /bin/grep Requires: /bin/gunzip @@ -404,7 +230,7 @@ Requires: /bin/hostname Requires: /bin/kill Requires: /bin/ln Requires: /bin/ls -Requires: mailx +Requires: /bin/mailx Requires: /bin/mkdir Requires: /bin/mknod Requires: /bin/mktemp @@ -450,17 +276,11 @@ 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 @@ -473,8 +293,6 @@ Requires: /usr/bin/locale Requires: /usr/bin/localedef Requires: /usr/bin/logger Requires: /usr/bin/logname -Requires: /usr/bin/lp -Requires: /usr/bin/lpr Requires: /usr/bin/m4 Requires: /usr/bin/make Requires: /usr/bin/man @@ -495,6 +313,7 @@ Requires: /usr/bin/pr Requires: /usr/bin/printf Requires: /usr/bin/python Requires: /usr/bin/renice +Requires: /usr/bin/seq Requires: /usr/bin/split Requires: /usr/bin/strip Requires: /usr/bin/tail @@ -508,6 +327,8 @@ Requires: /usr/bin/unexpand Requires: /usr/bin/uniq Requires: /usr/bin/wc Requires: /usr/bin/xargs +Requires: /usr/lib/lsb/install_initd +Requires: /usr/lib/lsb/remove_initd Requires: /usr/sbin/groupadd Requires: /usr/sbin/groupdel Requires: /usr/sbin/groupmod @@ -524,10 +345,268 @@ 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. +%package graphics +Group: System Environment/Base +Summary: LSB graphics libraries support for Red Hat Enterprise Linux + +%ifarch %{ix86} +# archLSB IA32 Graphics Libraries +Requires: libatk-1.0.so.0 +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: libpango-1.0.so.0 +Requires: libpangocairo-1.0.so.0 +Requires: libpangoft2-1.0.so.0 +Requires: libpangoxft-1.0.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 +%endif + +%ifarch ia64 +# archLSB IA64 Graphics Libraries +Requires: libatk-1.0.so.0()(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: libpango-1.0.so.0()(64bit) +Requires: libpangocairo-1.0.so.0()(64bit) +Requires: libpangoft2-1.0.so.0()(64bit) +Requires: libpangoxft-1.0.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) +%endif + +%ifarch ppc +# archLSB PPC32 Graphics Libraries +Requires: libatk-1.0.so.0 +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: libpango-1.0.so.0 +Requires: libpangocairo-1.0.so.0 +Requires: libpangoft2-1.0.so.0 +Requires: libpangoxft-1.0.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 +%endif + +%ifarch ppc64 +# archLSB PPC64 Graphics Libraries +Requires: libatk-1.0.so.0()(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: libpango-1.0.so.0()(64bit) +Requires: libpangocairo-1.0.so.0()(64bit) +Requires: libpangoft2-1.0.so.0()(64bit) +Requires: libpangoxft-1.0.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) +%endif + +%ifarch s390 +# archLSB S390 Graphics Libraries +Requires: libatk-1.0.so.0 +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: libpango-1.0.so.0 +Requires: libpangocairo-1.0.so.0 +Requires: libpangoft2-1.0.so.0 +Requires: libpangoxft-1.0.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 +%endif + +%ifarch s390x +# archLSB S390X Graphics Libraries +Requires: libatk-1.0.so.0()(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: libpango-1.0.so.0()(64bit) +Requires: libpangocairo-1.0.so.0()(64bit) +Requires: libpangoft2-1.0.so.0()(64bit) +Requires: libpangoxft-1.0.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) +%endif + +%ifarch x86_64 +# archLSB AMD64 Graphics Libraries +Requires: libatk-1.0.so.0()(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: libpango-1.0.so.0()(64bit) +Requires: libpangocairo-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) +%endif + +# gLSB Graphics Libraries +Requires: libasound.so.2%{qual} +Requires: libatk-1.0.so.0%{qual} +Requires: libcairo.so.2%{qual} +Requires: libcrypt.so.1%{qual} +Requires: libcups.so.2%{qual} +Requires: libcupsimage.so.2%{qual} +Requires: libfontconfig.so.1%{qual} +Requires: libfreetype.so.6%{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: libGLU.so.1%{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: libpango-1.0.so.0%{qual} +Requires: libpangocairo-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: 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: libSM.so.6%{qual} +Requires: libX11.so.6%{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: libXtst.so.6%{qual} + +# gLSB Graphics Command and Utilities +Requires: /usr/bin/fc-cache +Requires: /usr/bin/fc-list +Requires: /usr/bin/fc-match + +Provides: lsb-graphics-%{archname} = %{version} +Provides: lsb-graphics-noarch = %{version} + +%description graphics +The Linux Standard Base (LSB) Graphics Specifications define components that are required + to be present on an LSB conforming system. + +%package printing +Group: System Environment/Base +Summary: LSB printing libraries support for Red Hat Enterprise Linux + +# gLSB Printing Libraries +Requires: libcups.so.2%{qual} +Requires: libcupsimage.so.2%{qual} + +# gLSB Printing Command and Utilities +Requires: /usr/bin/foomatic-rip +Requires: /usr/bin/gs +Requires: /usr/bin/lp +Requires: /usr/bin/lpr + +Provides: lsb-printing-%{archname} = %{version} +Provides: lsb-printing-noarch = %{version} + +%description printing +The Linux Standard Base (LSB) Printing Specifications define components that are required + to be present on an LSB conforming system. + %prep %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p0 -b .triggerfix %build cd lsb-release-%{upstreamlsbrelver} @@ -535,14 +614,14 @@ make %pre # remove the extra symlink /bin/mailx -> /bin/mail - if [ -e /bin/mailx ]; then - if [ -L /bin/mailx ]; then - rm -f /bin/mailx - fi - fi +if [ -e /bin/mailx ]; then + if [ -L /bin/mailx ]; then + rm -f /bin/mailx + fi +fi + %install -rm -rf $RPM_BUILD_ROOT # LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT%{_mandir} \ $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT/usr/lib/lsb \ @@ -551,15 +630,22 @@ 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/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 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-4.0-%{archname} +touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-4.0-noarch +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-4.0-%{archname} +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-4.0-noarch +touch $RPM_BUILD_ROOT/etc/lsb-release.d/printing-4.0-%{archname} +touch $RPM_BUILD_ROOT/etc/lsb-release.d/printing-4.0-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 +#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 @@ -573,7 +659,7 @@ mkdir -p $RPM_BUILD_ROOT/bin # it's OK to put non binary in /usr/lib. 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 +#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 @@ -582,16 +668,13 @@ ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd # According to https://bugzilla.redhat.com/show_bug.cgi?id=232918 , the '-static' option # is imported against segfault error while running redhat_lsb_trigger -gcc $RPM_OPT_FLAGS -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \ +gcc $RPM_OPT_FLAGS -Os -static -fno-stack-protector -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} cp -p redhat_lsb_init $RPM_BUILD_ROOT/bin/redhat_lsb_init -%clean -rm -rf $RPM_BUILD_ROOT - %triggerpostun -- glibc if [ -x /usr/sbin/redhat_lsb_trigger.%{_target_cpu} ]; then /usr/sbin/redhat_lsb_trigger.%{_target_cpu} @@ -622,18 +705,12 @@ fi %endif %files -#/usr/X11R6/lib/X11/fonts -#/usr/X11R6/lib/X11/rgb.txt %defattr(-,root,root) %{_sysconfdir}/redhat-lsb -#%config /etc/lsb-release -#/etc/redhat-lsb %dir %{_sysconfdir}/lsb-release.d # These files are needed because they shows which LSB we're supporting now, # for example, if core-3.1-noarch exists, it means we are supporting LSB3.1 now %{_sysconfdir}/lsb-release.d/* -#%dir /usr/X11R6/lib/X11/xserver -#/usr/X11R6/lib/X11/xserver/* %{_mandir}/*/* %{_bindir}/* #/bin/mailx @@ -642,11 +719,29 @@ fi /%{_lib}/*so* /lib/lsb* %{_sbindir}/redhat_lsb_trigger.%{_target_cpu} -#/usr/X11R6/lib/X11/xserver/SecurityPolicy -#/usr/X11R6/lib/X11/fonts -#/usr/X11R6/lib/X11/rgb.txt + +%files graphics +%defattr(-,root,root) +%{_sysconfdir}/lsb-release.d/graphics* + +%files printing +%defattr(-,root,root) +%{_sysconfdir}/lsb-release.d/printing* + %changelog +* Thu Jun 24 2010 Parag - 4.0-3 +- Resolves:rh#585858:-redhat-lsb-graphics broken + +* Fri Jan 15 2010 Lawrence Lim - 4.0-2 +- update spec file to split package into core, desktop and printing (Curtis Doty, #472633) + +* Fri Jan 8 2010 Lawrence Lim - 4.0-1 +- update to LSB4.0 + +* Tue Oct 27 2009 Tom "spot" Callaway - 3.2-7 +- apply fix from bz514760 (thanks to Jakub Jelinek) + * Wed Oct 21 2009 Tom "spot" Callaway - 3.2-6 - apply fix from bz485367 (thanks to Jon Thomas) @@ -683,6 +778,9 @@ fi * Thu Jul 31 2008 Lawrence Lim - 3.1-21 - remove symlink for mailx (Bug #457241) +* Wed Apr 16 2008 Mats Wichmann 3.2-1 +- port forward to LSB 3.2 + * Tue Feb 19 2008 Fedora Release Engineering - 3.1-20 - Autorebuild for GCC 4.3 @@ -702,11 +800,17 @@ fi - 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 - 3.1-14.fc7 +* Wed Jul 2 2007 Lawrence Lim - 3.1-14.fc7 - fixed Bug 232918 for new glibc version -* Wed Feb 21 2007 Lawrence Lim - 3.1-13 -- fixed Bug 226363 +* Tue Jun 26 2007 Lawrence Lim - 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 - 3.1-12.2.EL +- Resolves: bug 217566 +- revise patch * Wed Nov 29 2006 Lawrence Lim - 3.1-12 - replaced aliases with functions in /lib/lsb/init-functions; Bug 217566 @@ -785,7 +889,7 @@ fi * Fri Jan 21 2005 Leon Ho 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 1.3-6 - Fixed invalid sln call for trigger in postun on ia64 (#137647) diff --git a/sources b/sources index b1541c9..e782264 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b3be7112275d0f5fc604539a8cd3c89 redhat-lsb-3.2-1.tar.bz2 +d83e0e5050bf0095badb2e575d3ee714 redhat-lsb-4.0-1.tar.bz2