Attachment 304156 Details for Bug 442803 – patch to update redhat-lsb (expanded) tarball

[patch] patch to update redhat-lsb (expanded) tarball

redhat-lsb-3.2-patch (text/plain), 23.40 KB, created by Mats Wichmann on 2008-04-29 20:59:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mats Wichmann

Created: 2008-04-29 20:59:41 UTC

Size: 23.40 KB

patch

obsolete

>diff -Naur redhat-lsb-3.1/mkbaselist2 redhat-lsb-3.2/mkbaselist2
>--- redhat-lsb-3.1/mkbaselist2	2006-06-28 16:49:48.000000000 -0600
>+++ redhat-lsb-3.2/mkbaselist2	2008-04-18 08:33:58.000000000 -0600
>@@ -1,19 +1,25 @@
> #!/usr/bin/perl
> 
> # Source originally from lsb-cmdchk
>-# Creating a list of command required by LSB
>-
>-use CGI;
>-use Mysql;
>+# Creating a list of base libraries required by LSB
>+#
>+# changes from 3.1 version: LSB database is now version-aware
>+#                           DBI is used instead of deprecated Mysql.pm
> 
>+use DBI;
>+use Getopt::Long;
> use Env qw(LSBUSER LSBDBPASSWD LSBDB LSBDBHOST);
> 
> sub usage()
> {
>-print STDERR "mkbaselist\n";
>+print STDERR "mkbaselist -v <lsbversion> <arch>\n";
>+print STDERR "          <arch> selects specific or All\n";
> die;
> }
> 
>+GetOptions("v=s" => \$lsbversion);
>+if( !$lsbversion ) { usage(); }
>+
> # Uncomment to trace SQL statments
> #$trace=1;
> 
>@@ -21,33 +27,49 @@
> # 2) Establish connection to the database
> #
> 
>-$Dbh = Mysql->connect($LSBDBHOST,$LSBDB,$LSBUSER, $LSBDBPASSWD) || die $Mysql::db_errstr;
>+my $dbh = DBI->connect('DBI:mysql:database='.$LSBDB.';host='.$LSBDBHOST, $LSBUSER, $LSBDBPASSWD) 
>+    or die "Couldn't connect to database: ".$DBI->db_errstr;
> 
> #
>-# 3) Get the list of LSB_Core and LSB_Cpp
>+# 3) Get the list of libraries for LSB_Core and LSB_Cpp
>+#    For LSB 3.2 LSB_Printing and LSB_Languages is added
> #
>-# As of LSB3.1, should have (11) 
>-
> 
>-$select = "SELECT DISTINCT Mname,ALrunname,Aname FROM Module ";
>-$select.= "LEFT JOIN ModLib ON MLmid=Mid ";
>-$select.= "LEFT JOIN Library ON Lid=MLlid ";
>+$select = "SELECT DISTINCT ALrunname,Lname from Library ";
>+$select.= "LEFT JOIN ModLib ON MLlid=Lid ";
>+$select.= "LEFT JOIN SubModule ON SMid=MLmid ";
>+$select.= "LEFT JOIN ModSMod ON MSMsmid=SMid ";
>+$select.= "LEFT JOIN Module on Mid=MSMmid ";
> $select.= "LEFT JOIN ArchLib ON ALlid=Lid ";
> $select.= "LEFT JOIN Architecture ON ALaid=Aid ";
>-$select.= "WHERE Lstd='Yes' "; 
>-$select.= "AND Aname='";
>-$select.= $ARGV[0];
>-#$select.= "' AND ALrunname!='/lib/ld-lsb.so.3' ";  ### bad hack :(
>-$select.= "' ORDER BY Mname,ALrunname DESC "; 
>+$select.= "WHERE ( (ALappearedin <= '$lsbversion' and ALappearedin<>'') ";
>+$select.= "AND (ALwithdrawnin IS NULL OR ALwithdrawnin > '$lsbversion') ) ";
>+$select.= "AND Aname='".$ARGV[0]."' ";
>+if( $ARGV[0] ne 'All' ) {
>+    $select.= "AND Lid NOT IN (";
>+    $select.= " SELECT ALlid FROM ArchLib WHERE ALaid=1 AND ALrunname>'' ";
>+    $select.= " AND ALappearedin <= '$lsbversion' and ALappearedin >'' ";
>+    $select.= " AND (ALwithdrawnin IS NULL OR ALwithdrawnin > '$lsbversion') ";
>+    $select.= ") ";
>+}
>+$select.= "AND ALrunname!='' ";
>+#temporary: graphics script isn't called, so just do all here
>+#$select.= "AND Mname IN ('LSB-Core','LSB-CXX','LSB-Printing','LSB-Languages') ";
>+$select.= "ORDER BY ALrunname ";
> 
> #print $select;
> 
>-$sth = $Dbh->query($select) || die $Dbh->errmsg();
>-
>-for(1..$sth->numrows) {
>-	%entry=$sth->fetchhash;
>-	$graphicsname=$entry{'ALrunname'};
>-	#print CMDS "$graphicsname ".$entry{'Mname'}."\n";
>-	print "$graphicsname\n";
>+my $sth = $dbh->prepare($select) 
>+    or die "Couldn't prepare $select query: ".DBI->errstr;
>+$sth->execute 
>+    or die "Couldn't execute $select query: ".DBI->errstr;
>+
>+for(1..$sth->rows) {
>+        my $entry = $sth->fetchrow_hashref 
>+            or die "Fetchrow failed on $select query: ".DBI->errstr;
>+	$basename=$entry->{'ALrunname'};
>+	print "$basename\n";
> }
>-#close(CMDS);
>+
>+$sth->finish;
>+$dbh->disconnect;
>diff -Naur redhat-lsb-3.1/mkcmdlist2 redhat-lsb-3.2/mkcmdlist2
>--- redhat-lsb-3.1/mkcmdlist2	2006-06-27 15:20:07.000000000 -0600
>+++ redhat-lsb-3.2/mkcmdlist2	2008-04-18 08:39:33.000000000 -0600
>@@ -1,19 +1,21 @@
> #!/usr/bin/perl
> 
> # Source originally from lsb-cmdchk
>-# Creating a list of command required by LSB
>-
>-use CGI;
>-use Mysql;
>+# Creating a list of commands required by LSB
> 
>+use DBI;
>+use Getopt::Long;
> use Env qw(LSBUSER LSBDBPASSWD LSBDB LSBDBHOST);
> 
> sub usage()
> {
>-print STDERR "mkcmdlist\n";
>+print STDERR "mkcmdlist -v <lsbversion>\n";
> die;
> }
> 
>+GetOptions("v=s" => \$lsbversion);
>+if( !$lsbversion ) { usage(); }
>+
> # Uncomment to trace SQL statments
> #$trace=1;
> 
>@@ -21,28 +23,40 @@
> # 2) Establish connection to the database
> #
> 
>-$Dbh = Mysql->connect($LSBDBHOST,$LSBDB,$LSBUSER, $LSBDBPASSWD) || die $Mysql::db_errstr;
>+my $dbh = DBI->connect('DBI:mysql:database='.$LSBDB.';host='.$LSBDBHOST, $LSBUSER, $LSBDBPASSWD) 
>+    or die "Couldn't connect to database: ".$DBI->db_errstr;
> 
> #
> # 3) Get the list of cmds
> #
> 
>-#open(CMDS,">cmdlist");
>-#print CMDS "# Generated file\n";
>-#print CMDS "# List of LSB commands for the Python cmdchk\n";
>-
> $select = "SELECT DISTINCT Cid,Cname,Cpath FROM Command ";
>-$select.= "WHERE Cstatus='Included' ";
>+$select.= "LEFT JOIN ModCmd ON MCcid=Cid ";
>+$select.= "LEFT JOIN SubModule on SMid=MCmid ";
>+$select.= "WHERE (MCappearedin <= '$lsbversion' and MCappearedin<>'') ";
>+$select.= "AND (MCwithdrawnin IS NULL OR MCwithdrawnin > '$lsbversion') ";
>+# LSB policy is now to include TrialUse elements
>+#$select.= "AND (SMmandatorysince <= '$lsbversion' and SMmandatorysince<>'') ";
>+$select.= "AND Cbuiltin!='Yes' ";
> $select.= "ORDER BY Cname ";
> 
> #print $select;
> 
>-$sth = $Dbh->query($select) || die $Dbh->errmsg();
>-
>-for(1..$sth->numrows) {
>-	%entry=$sth->fetchhash;
>-	$cmdname=$entry{'Cname'};
>-	#print CMDS "$cmdname ".$entry{'Cpath'}."\n";
>+my $sth = $dbh->prepare($select) 
>+    or die "Couldn't prepare $select query: ".DBI->errstr;
>+$sth->execute or die "Couldn't execute $select query: ".DBI->errstr;
>+
>+for(1..$sth->rows) {
>+        my $entry = $sth->fetchrow_hashref 
>+            or die "Fetchrow failed on $select query: ".DBI->errstr;
>+	$cmdname=$entry->{'Cname'};
>+        #if ($entry->{'Cpath'} eq "") {
>+        #    $cmdpath='None';
>+        #} else {
>+        #    $cmdpath=$entry->{'Cpath'};
>+        #}
> 	print "$cmdname\n";
> }
>-#close(CMDS);
>+
>+$sth->finish;
>+$dbh->disconnect;
>diff -Naur redhat-lsb-3.1/mkgraphiclist2 redhat-lsb-3.2/mkgraphiclist2
>--- redhat-lsb-3.1/mkgraphiclist2	2006-06-27 19:25:56.000000000 -0600
>+++ redhat-lsb-3.2/mkgraphiclist2	2008-04-18 08:35:33.000000000 -0600
>@@ -1,19 +1,25 @@
> #!/usr/bin/perl
> 
> # Source originally from lsb-cmdchk
>-# Creating a list of command required by LSB
>-
>-use CGI;
>-use Mysql;
>+# Creating a list of desktop (graphics) libraries required by LSB
>+#
>+# changes from 3.1 version: LSB database is now version-aware
>+#                           DBI is used instead of deprecated Mysql.pm
> 
>+use DBI;
>+use Getopt::Long;
> use Env qw(LSBUSER LSBDBPASSWD LSBDB LSBDBHOST);
> 
> sub usage()
> {
>-print STDERR "mkgraphiclist\n";
>+print STDERR "mkgraphiclist -v <lsbversion> <arch>\n";
>+print STDERR "          <arch> selects specific or All\n";
> die;
> }
> 
>+GetOptions("v=s" => \$lsbversion);
>+if( !$lsbversion ) { usage(); }
>+
> # Uncomment to trace SQL statments
> #$trace=1;
> 
>@@ -21,32 +27,47 @@
> # 2) Establish connection to the database
> #
> 
>-$Dbh = Mysql->connect($LSBDBHOST,$LSBDB,$LSBUSER, $LSBDBPASSWD) || die $Mysql::db_errstr;
>+my $dbh = DBI->connect('DBI:mysql:database='.$LSBDB.';host='.$LSBDBHOST, $LSBUSER, $LSBDBPASSWD) 
>+    or die "Couldn't connect to database: ".$DBI->db_errstr;
> 
> #
>-# 3) Get the list of LSB_Graphics
>+# 3) Get the list of libraries for LSB_Desktop
> #
>-# As of LSB3.1, should have (7) libXt.so.6, libXext.so.6, libSM.so.6, libX11.so.6, libGL.so.1, libICE.so.6, libXi.so.6
>-
> 
>-$select = "SELECT DISTINCT Mname,ALrunname,Aname FROM Module ";
>-$select.= "LEFT JOIN ModLib ON MLmid=Mid ";
>-$select.= "LEFT JOIN Library ON Lid=MLlid ";
>+$select = "SELECT DISTINCT ALrunname,Lname from Library ";
>+$select.= "LEFT JOIN ModLib ON MLlid=Lid ";
>+$select.= "LEFT JOIN SubModule ON SMid=MLmid ";
>+$select.= "LEFT JOIN ModSMod ON MSMsmid=SMid ";
>+$select.= "LEFT JOIN Module on Mid=MSMmid ";
> $select.= "LEFT JOIN ArchLib ON ALlid=Lid ";
> $select.= "LEFT JOIN Architecture ON ALaid=Aid ";
>-$select.= "WHERE Lstd='Yes' "; 
>-$select.= "AND Aname!='None' ";
>-$select.= "AND Mname='LSB_Graphics' ";
>-$select.= "ORDER BY Mname,ALrunname DESC "; 
>+$select.= "WHERE ( (ALappearedin <= '$lsbversion' and ALappearedin<>'') ";
>+$select.= "AND (ALwithdrawnin IS NULL OR ALwithdrawnin > '$lsbversion') ) ";
>+$select.= "AND Aname='".$ARGV[0]."' ";
>+if( $ARGV[0] ne 'All' ) {
>+    $select.= "AND Lid NOT IN (";
>+    $select.= " SELECT ALlid FROM ArchLib WHERE ALaid=1 AND ALrunname>'' ";
>+    $select.= " AND ALappearedin <= '$lsbversion' and ALappearedin >'' ";
>+    $select.= " AND (ALwithdrawnin IS NULL OR ALwithdrawnin > '$lsbversion') ";
>+    $select.= ") ";
>+}
>+$select.= "AND ALrunname!='' ";
>+$select.= "AND Mname IN ('LSB-Desktop') ";
>+$select.= "ORDER BY ALrunname ";
> 
> #print $select;
> 
>-$sth = $Dbh->query($select) || die $Dbh->errmsg();
>-
>-for(1..$sth->numrows) {
>-	%entry=$sth->fetchhash;
>-	$graphicsname=$entry{'ALrunname'};
>-	#print CMDS "$graphicsname ".$entry{'Mname'}."\n";
>+my $sth = $dbh->prepare($select) 
>+    or die "Couldn't prepare $select query: ".DBI->errstr;
>+$sth->execute 
>+    or die "Couldn't execute $select query: ".DBI->errstr;
>+
>+for(1..$sth->rows) {
>+        my $entry = $sth->fetchrow_hashref 
>+            or die "Fetchrow failed on $select query: ".DBI->errstr;
>+	$graphicsname=$entry->{'ALrunname'};
> 	print "$graphicsname\n";
> }
>-#close(CMDS);
>+
>+$sth->finish;
>+$dbh->disconnect;
>diff -Naur redhat-lsb-3.1/mkredhat-lsb redhat-lsb-3.2/mkredhat-lsb
>--- redhat-lsb-3.1/mkredhat-lsb	2006-06-28 17:51:32.000000000 -0600
>+++ redhat-lsb-3.2/mkredhat-lsb	2008-04-16 14:30:36.000000000 -0600
>@@ -23,7 +23,7 @@
> 
> #checkFile $LSB_ROOT/lsbversion
> #LSB_VERSION=$(cat $LSB_ROOT/lsbversion)
>-LSB_VERSION=3.0
>+LSB_VERSION=3.2
> 
> #
> # archLSB IA32 Libraries
>@@ -35,49 +35,49 @@
> EXCLUDED_LD_LSB="(ld-lsb)"
> 
> ARCHLSB_IA32_BASELIB="# archLSB IA32 Base Libraries"
>-IA32_BASELIB=`./mkbaselist2 IA32 | egrep -v $EXCLUDED_LD_LSB`
>+IA32_BASELIB=`./mkbaselist2 -v $LSB_VERSION IA32 | egrep -v $EXCLUDED_LD_LSB`
> # Add the Requires: to each.
> for BASELIB in $IA32_BASELIB; do
>     ARCHLSB_IA32_BASELIB=`echo -e "$ARCHLSB_IA32_BASELIB"'\\\\\\n'"Requires: $BASELIB"`
> done
> 
> ARCHLSB_IA64_BASELIB="# archLSB IA64 Base Libraries"
>-IA64_BASELIB=`./mkbaselist2 IA64 | egrep -v $EXCLUDED_LD_LSB`
>+IA64_BASELIB=`./mkbaselist2 -v $LSB_VERSION IA64 | egrep -v $EXCLUDED_LD_LSB`
> # Add the Requires: to each.
> for BASELIB in $IA64_BASELIB; do
>     ARCHLSB_IA64_BASELIB=`echo -e "$ARCHLSB_IA64_BASELIB"'\\\\\\n'"Requires: $BASELIB()(64bit)"`
> done
> 
> ARCHLSB_PPC32_BASELIB="# archLSB PPC32 Base Libraries"
>-PPC32_BASELIB=`./mkbaselist2 PPC32 | egrep -v $EXCLUDED_LD_LSB`
>+PPC32_BASELIB=`./mkbaselist2 -v $LSB_VERSION PPC32 | egrep -v $EXCLUDED_LD_LSB`
> # Add the Requires: to each.
> for BASELIB in $PPC32_BASELIB; do
>     ARCHLSB_PPC32_BASELIB=`echo -e "$ARCHLSB_PPC32_BASELIB"'\\\\\\n'"Requires: $BASELIB"`
> done
> 
> ARCHLSB_PPC64_BASELIB="# archLSB PPC64 Base Libraries"
>-PPC64_BASELIB=`./mkbaselist2 PPC64 | egrep -v $EXCLUDED_LD_LSB`
>+PPC64_BASELIB=`./mkbaselist2 -v $LSB_VERSION PPC64 | egrep -v $EXCLUDED_LD_LSB`
> # Add the Requires: to each.
> for BASELIB in $PPC64_BASELIB; do
>     ARCHLSB_PPC64_BASELIB=`echo -e "$ARCHLSB_PPC64_BASELIB"'\\\\\\n'"Requires: $BASELIB()(64bit)"`
> done
> 
> ARCHLSB_S390_BASELIB="# archLSB S390 Base Libraries"
>-S390_BASELIB=`./mkbaselist2 S390 | egrep -v $EXCLUDED_LD_LSB`
>+S390_BASELIB=`./mkbaselist2 -v $LSB_VERSION S390 | egrep -v $EXCLUDED_LD_LSB`
> # Add the Requires: to each.
> for BASELIB in $S390_BASELIB; do
>     ARCHLSB_S390_BASELIB=`echo -e "$ARCHLSB_S390_BASELIB"'\\\\\\n'"Requires: $BASELIB"`
> done
> 
> ARCHLSB_S390X_BASELIB="# archLSB S390X Base Libraries"
>-S390X_BASELIB=`./mkbaselist2 S390X | egrep -v $EXCLUDED_LD_LSB`
>+S390X_BASELIB=`./mkbaselist2 -v $LSB_VERSION S390X | egrep -v $EXCLUDED_LD_LSB`
> # Add the Requires: to each.
> for BASELIB in $S390X_BASELIB; do
>     ARCHLSB_S390X_BASELIB=`echo -e "$ARCHLSB_S390X_BASELIB"'\\\\\\n'"Requires: $BASELIB()(64bit)"`
> done
> 
> ARCHLSB_AMD64_BASELIB="# archLSB AMD64 Base Libraries"
>-AMD64_BASELIB=`./mkbaselist2 x86-64 | egrep -v $EXCLUDED_LD_LSB`
>+AMD64_BASELIB=`./mkbaselist2 -v $LSB_VERSION x86-64 | egrep -v $EXCLUDED_LD_LSB`
> # Add the Requires: to each.
> for BASELIB in $AMD64_BASELIB; do
>     ARCHLSB_AMD64_BASELIB=`echo -e "$ARCHLSB_AMD64_BASELIB"'\\\\\\n'"Requires: $BASELIB()(64bit)"`
>@@ -90,7 +90,7 @@
> # however, need to change it to extract from DB directly later
> 
> GLSB_BASELIB="# gLSB Base/Utility/Stdc++/Graphics Libraries"
>-ALL_BASELIB=`./mkbaselist2 All | egrep -v $EXCLUDED_LD_LSB`
>+ALL_BASELIB=`./mkbaselist2 -v $LSB_VERSION All | egrep -v $EXCLUDED_LD_LSB`
> # Add the Requires: to each.
> for BASELIB in $ALL_BASELIB; do
>     GLSB_BASELIB=`echo -e "$GLSB_BASELIB"'\\\\\\n'"Requires: $BASELIB%{qual}"`
>@@ -129,7 +129,7 @@
> 
> GLSB_COMMAND_UTILITIES="# gLSB Command and Utilities"
> #COMMANDS=`grep '<ENTRY>' $LSB_ROOT/LSB/generic/command/command.sgml | cut -b8- | 
>-COMMANDS=`./mkcmdlist2 |
>+COMMANDS=`./mkcmdlist2 -v $LSB_VERSION |
>           egrep -v $EXCLUDED_COMMANDS_REGEX`
> 
> #Check to make sure each required command exists
>diff -Naur redhat-lsb-3.1/redhat-lsb.spec redhat-lsb-3.2/redhat-lsb.spec
>--- redhat-lsb-3.1/redhat-lsb.spec	2008-04-15 10:55:27.000000000 -0600
>+++ redhat-lsb-3.2/redhat-lsb.spec	2008-04-18 08:39:38.000000000 -0600
>@@ -48,12 +48,13 @@
> 
> Summary: LSB support for Red Hat Linux
> Name: redhat-lsb
>-Version: 3.1
>-Release: 13.f8
>-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: GPL
> Group: System Environment/Base
> BuildRoot: %{_tmppath}/%{name}-root
>@@ -90,38 +91,246 @@
> 
> %ifarch %{ix86}
> # archLSB IA32 Base Libraries
>+Requires: libc.so.6
>+Requires: libm.so.6
> %endif
> 
> %ifarch ia64
> # archLSB IA64 Base Libraries
>+Requires: libc.so.6.1()(64bit)
>+Requires: libm.so.6.1()(64bit)
> %endif
> 
> %ifarch ppc
> # archLSB PPC32 Base Libraries
>+Requires: libc.so.6
>+Requires: libm.so.6
> %endif
> 
> %ifarch ppc64
> # archLSB PPC64 Base Libraries
>+Requires: libc.so.6()(64bit)
>+Requires: libm.so.6()(64bit)
> %endif
> 
> %ifarch s390
> # archLSB S390 Base Libraries
>+Requires: libc.so.6
>+Requires: libm.so.6
> %endif
> 
> %ifarch s390x
> # archLSB S390X Base Libraries
>+Requires: libc.so.6()(64bit)
>+Requires: libm.so.6()(64bit)
> %endif
> 
> %ifarch x86_64
> # archLSB AMD64 Base Libraries
>+Requires: libc.so.6()(64bit)
>+Requires: libm.so.6()(64bit)
> %endif
> 
> # gLSB Base/Utility/Stdc++/Graphics Libraries
>+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: 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
>+Requires: /bin/awk
>+Requires: /bin/basename
>+Requires: /bin/cat
>+Requires: /bin/chgrp
>+Requires: /bin/chmod
>+Requires: /bin/chown
>+Requires: /bin/cp
>+Requires: /bin/cpio
>+Requires: /bin/cut
>+Requires: /bin/date
>+Requires: /bin/dd
>+Requires: /bin/df
>+Requires: /bin/dmesg
>+Requires: /bin/echo
>+Requires: /bin/ed
>+Requires: /bin/egrep
>+Requires: /bin/env
>+Requires: /bin/false
>+Requires: /bin/fgrep
>+Requires: /bin/find
>+Requires: /bin/gettext
>+Requires: /bin/grep
>+Requires: /bin/gunzip
>+Requires: /bin/gzip
>+Requires: /bin/hostname
>+Requires: /bin/kill
>+Requires: /bin/ln
>+Requires: /bin/ls
>+Requires: /bin/mailx
>+Requires: /bin/mkdir
>+Requires: /bin/mknod
>+Requires: /bin/mktemp
>+Requires: /bin/more
>+Requires: /bin/mount
>+Requires: /bin/mv
>+Requires: /bin/nice
>+Requires: /bin/ps
>+Requires: /bin/pwd
>+Requires: /bin/rm
>+Requires: /bin/rmdir
>+Requires: /bin/sed
>+Requires: /bin/sh
>+Requires: /bin/sleep
>+Requires: /bin/sort
>+Requires: /bin/stty
>+Requires: /bin/su
>+Requires: /bin/sync
>+Requires: /bin/tar
>+Requires: /bin/touch
>+Requires: /bin/true
>+Requires: /bin/umount
>+Requires: /bin/uname
>+Requires: /bin/zcat
>+Requires: /sbin/fuser
>+Requires: /sbin/pidof
>+Requires: /sbin/shutdown
>+Requires: /usr/bin/[
>+Requires: /usr/bin/ar
>+Requires: /usr/bin/at
>+Requires: /usr/bin/batch
>+Requires: /usr/bin/bc
>+Requires: /usr/bin/chfn
>+Requires: /usr/bin/chsh
>+Requires: /usr/bin/cksum
>+Requires: /usr/bin/cmp
>+Requires: /usr/bin/col
>+Requires: /usr/bin/comm
>+Requires: /usr/bin/crontab
>+Requires: /usr/bin/csplit
>+Requires: /usr/bin/diff
>+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/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
>+Requires: /usr/bin/install
>+Requires: /usr/bin/ipcrm
>+Requires: /usr/bin/ipcs
>+Requires: /usr/bin/join
>+Requires: /usr/bin/killall
>+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
>+Requires: /usr/bin/md5sum
>+Requires: /usr/bin/mkfifo
>+Requires: /usr/bin/msgfmt
>+Requires: /usr/bin/newgrp
>+Requires: /usr/bin/nl
>+Requires: /usr/bin/nohup
>+Requires: /usr/bin/od
>+Requires: /usr/bin/passwd
>+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
>+Requires: /usr/bin/tail
>+Requires: /usr/bin/tee
>+Requires: /usr/bin/test
>+Requires: /usr/bin/time
>+Requires: /usr/bin/tr
>+Requires: /usr/bin/tsort
>+Requires: /usr/bin/tty
>+Requires: /usr/bin/unexpand
>+Requires: /usr/bin/uniq
>+Requires: /usr/bin/wc
>+Requires: /usr/bin/xargs
>+Requires: /usr/bin/xdg-desktop-icon
>+Requires: /usr/bin/xdg-desktop-menu
>+Requires: /usr/bin/xdg-email
>+Requires: /usr/bin/xdg-icon-resource
>+Requires: /usr/bin/xdg-mime
>+Requires: /usr/bin/xdg-open
>+Requires: /usr/bin/xdg-screensaver
>+Requires: /usr/lib/lsb/install_initd
>+Requires: /usr/lib/lsb/remove_initd
>+Requires: /usr/sbin/groupadd
>+Requires: /usr/sbin/groupdel
>+Requires: /usr/sbin/groupmod
>+Requires: /usr/sbin/sendmail
>+Requires: /usr/sbin/useradd
>+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 that all
>@@ -146,10 +355,15 @@
> 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
>+# 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/graphics-3.1-%{archname}
>-touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-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
>@@ -229,6 +443,9 @@
> #/usr/X11R6/lib/X11/rgb.txt
> 
> %changelog
>+* Wed Apr 16 2008 Mats Wichmann <mats@freestandards.org> 3.2-1
>+- port forward to LSB 3.2
>+
> * 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
>diff -Naur redhat-lsb-3.1/redhat-lsb.spec.in redhat-lsb-3.2/redhat-lsb.spec.in
>--- redhat-lsb-3.1/redhat-lsb.spec.in	2007-07-17 20:33:18.000000000 -0600
>+++ redhat-lsb-3.2/redhat-lsb.spec.in	2008-04-16 14:58:40.000000000 -0600
>@@ -48,12 +48,13 @@
> 
> Summary: LSB support for Red Hat Linux
> Name: redhat-lsb
>-Version: 3.1
>-Release: 13.f8
>-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: GPL
> Group: System Environment/Base
> BuildRoot: %{_tmppath}/%{name}-root
>@@ -121,7 +122,7 @@
> @GLSB_COMMAND_UTILITIES@
> 
> %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 that all
>@@ -146,10 +147,15 @@
> 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
>+# 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/graphics-3.1-%{archname}
>-touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-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
>@@ -229,6 +235,9 @@
> #/usr/X11R6/lib/X11/rgb.txt
> 
> %changelog
>+* Wed Apr 16 2008 Mats Wichmann <mats@freestandards.org> 3.2-1
>+- port forward to LSB 3.2
>+
> * 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

Actions: View | Diff

Attachments on bug 442803: 304156