rpms/redhat-lsb/devel lsb-release-2.0-disable-etc-lsb-release.patch, NONE, 1.1 lsb-release-2.0.tar.gz, NONE, 1.1 .cvsignore, 1.4, 1.5 redhat-lsb.spec, 1.13, 1.14 sources, 1.6, 1.7
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 13 03:50:13 UTC 2006
Author: llch
Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5243
Modified Files:
.cvsignore redhat-lsb.spec sources
Added Files:
lsb-release-2.0-disable-etc-lsb-release.patch
lsb-release-2.0.tar.gz
Log Message:
Migrate to rawhide
lsb-release-2.0-disable-etc-lsb-release.patch:
lsb_release | 10 ----------
1 files changed, 10 deletions(-)
--- NEW FILE lsb-release-2.0-disable-etc-lsb-release.patch ---
--- lsb-release-2.0.orig/lsb_release 2004-07-01 03:30:34.000000000 +1000
+++ lsb-release-2.0/lsb_release 2005-08-03 23:31:58.000000000 +1000
@@ -188,15 +188,6 @@
# Get/Init LSB infos (maybe Distrib infos too)
GetLSBInfo() {
- if [ -f "$INFO_ROOT/$INFO_LSB_FILE" ]
- then
- # should init at least LSB_VERSION
- . "$INFO_ROOT/$INFO_LSB_FILE"
- fi
- if [ -z "$LSB_VERSION" ]
- then
- LSB_VERSION=$MSG_NA
- else
# if we found LSB_VERSION, continue to look in directory
if [ -d "$INFO_ROOT/$INFO_LSB_DIR" ]
then
@@ -205,7 +196,6 @@
LSB_VERSION=$LSB_VERSION:`basename $tag`
done
fi
- fi
}
# Get the whole distrib information string (from ARG $1 file)
--- NEW FILE lsb-release-2.0.tar.gz ---
IÙÑ#HIÄ ÀÃ
g±²LnÊ8ÓõG«;ÇÈMóÊ䵪ã2ÆßÒß;)Oó7X²!:methà µÌ(Ä®-l£GHê¦=iñvAøt8Ëu`ºV¢Z+ùÑÌ8ßéïz[«2ÞèuA;×Õº(-¤´`¥ª¨$Nq¯½fæÌâïö]:/ãr§_á,Ímeâ¤w¦õSQëE3³;-Ä°èÅ,Y͵Éõ»5ñWKÕSÑ#¢¨4KSÄ$àMªmóÁáÛ§ÌØ^¨Ó¸"«PëøY4XGà;â2ôéSg;åMA±?Áq´N´µ~Iíú,j/>Ó&u¹ h¦d|RþE-þ^¥5ÎR;Ö×a|4.JÚ$×¹yz½Ü?ùí¾æÅK³oRÐv-kgVЫYTâ:á,k%7,KCZYÙ§±Rx"a]Ý";ádÒö«<*H+%9nÉʪÉ;SàÒ6+Þ|aÊ*ÃX±ÅÃtfiº8D;DÕQ"'þM¤K2_Å
o1Eéȯ8ºk{CVkCn§ðW2Ç3ôÒ`#>¹W¯Rg°[åÅV
,Wr#M¶Ú/ãw÷̯ìØÁ¢ÆÔóÂSXöéÃ$:ì&5oÈ*xW1ü+-W
ù°9f%°ûj«è´2[û>=?ã¼$i²+u¥:½8üàçÎLÌô²N!TåYÁÍ9ãYÎÆ.åE¡±çOXáyLu?³éÂĤ1·ÚÁ³7zw§XàÆgá@*Ol£
§y÷KÊB;>¹ë$(b¸<È1L|Êqob2+É`[G^rÑÂrÊ@Ì76 ÓéÄ*Ió8p°DI@jßp.-¤^DH»°NÚ
ØM¬>Aî8£ôÞ N®¬^ó& x¶Y¬ÃÃG ±ÊêʦìòÈ ØÝJLÑr©Ê:?½Êé$rwCE(6á+*
hWp[»ªj´$Wcj×;çÈ]3ûrMN·s»Ä'[açøî7_{ÐÌsÑZÃw¼£pU71]dSÙ°¢æ¼¸r_
ÅË¥b§!ÐäÐÞ
.Àë#©dê;Wñ~{Ä.a
ÜsÙ¤±W>³u.FUJX
ÞæÐÃ5¦)MRÛI*j?©p`
§KZ²/
Ý[>
©®¤Ü¶C¤ÎàÁ0joÔwªW¤ÚÒãAfÍÙBÚ!øOa«4«¸LXÿxI¿PæØ/FÁ5QÊý÷ª NNý?ª¶Raëˤº+éF(F
;( p.£n/§ìQ(
ßAkºì°òØØÄe
û¯}c¨mRÒ4ö"DvÈYÜøCîH?ÇY*ÛAftù]qÿMøڸ䶬`Äa9@îTN×YÒÎåB»áòe?Sz¬íÚkÄYXdÏ;ìK<ÈÑûÊéè$àN¯Ë_8ù_è`ñu¥9@"EP³2>u$¹ïê £p÷,Î@K.ñÌÁwm+í%·sB¢)Q¶´;|½ßÐb¿v^æ·¨qcuTC.¥´wô´ûì0éºré\-Û "1¡
¯E&sÒ"ºsÚneyòè
!ÑÒk\_NW|ºéïcèÂç8¤¦Z)m«TvYm¹2-©oÁb2|³LóTzTg¹õËt+7Ê°Ï_D\êúd{¨CeqZÀå-ÿLB'l§ìְƳÑ?¡»ðe
×£Û<¾lZ=
¨
_;¥²]Ú
ngÈhÎ"=µ°ÿd°E3:=â¯0c 4±ÆÏ
9ª¢ÕîlèÆM&
¼]þ©RTëqÓÜ¥lr£¹+=$ùåZv'x
H2ñNþþú5úTn7©-t÷Õp×ÚسHVÈ`åÈ@¶sêæ_)¡
È Êep©Ï|¦Q?¸Iå~sÄDrÝ&¾Létn_WF.Üü½öôÆ-MíÀ¼lº©3¸©Ë"¹À@Y9\ÙF}^ÛÓzºäö{ðKýJ$èí
óßs×þI±×n3=SÔ
jôÃTw®{Æí:?¨çzuÒ8H«»
RÜÍ»¯cWÑw
þÏMÒÓ«ÒíX¹1̶Àî¨X@ÔôWUJ¦ODRüVÆ3¼õo¹%OÓúõh
µnFrÔæ:àÖuÜ1M)þBWø%ßAÒtßI&QÞÚ9t¹§]</rix[<ײj¶`_úè¨õ¶¹îå!ª"$È> Oò¨¶k¶Þ;ÍVO_2~ÒÌK¸0è2¡âu2&íyMh¦<GÒ)ÔÝç§W$Î!ó,07ÙJ²ªÂ3ïù˵ý>ÅOnêu/b¥6 ë?Ê
QIAËU§d+õÏwíÍVX§KnáÈÁ,EE.½lÃ2#z$Òw #ºWo×|Þa1zA^»8%¸a%Ñ̸ê¾Úù:´srªÚºLB)1Ë©E,Ù5Å
zÔLálÃ+E¿ìÍÃɵ÷'³¾éï'6Ç!mɶÖ(ÄÙô,bÐÃuuë´§;^û¤o¡Ëõ¯?)òÈ9
¾0:ÝNØø˧à×à§ÙZr+cR}®F¥Ã:ãü(à
üÂò
_#Xé`êÇè°-<õéYãvI.µRë½b¢S«ÌÜoÆ|wϼHãÄ3;NñÆ[o2£Rp¹nd;17í%íóÏ~þئXÃ.Ыg ó¬.ØV°vFîHô¿b"0ÄTHêÝ.yjN`´DöɽÃ1½8&Àh GKEQ¼(gÅ2tT¬Ûx8R¤üD&÷ËÌå
ʳëÓX`ªé¯|u<¿ã`P"©lT£1&׳Dn9DWµ~Ôq< 0ÿ@ø:]Ö{¦Ü5Rî©MuTIóØ7½ÝÎ;&¦y?B9"N1T¤]a
âNõ¢öfí5~?ú©ÙθJïå±ê§ KHéú³ýÝmà=¶·ùæ A5¿¥ØÕe?ÙYz=t]l'6CDRíÈVìæNËvG|v\¹]¡GV®Äç[÷ú`jþê¸ÛTlIJ}¶{F±
$íá8FçÕhq#{0Hi¤_°Br»&L¬§§ý:¬BÞZã2ì
aÂÂ˸ZEJN¢t<ì°]×DüK\ó0àNFPÍÕqïÆYj_}Oq$wßQï²¥£ÇþìhjÆ0ºD5à8ÍtÎÊǯù³ø©èEv
}¨¨¢)G[ü¢ö¨ê=gâÉÈ4ÄÞAIh "$X@o-</£y<a;ÆÐ+ñSA7Ø3*5hì¿°7êçàô]Ø'øI0ô°ä`[-êUTxµ~§KyHiáÌ×wt×/A¢×@vEìFñÇ^_Òm8V¬I9`l}h¢íGh¡FjC%ÆÑÞádÏ*2>rOÑ ß.»EK¯¯Gk
ÚITu·¡Óñ39¹.ü\ãªÍ¿;Íìùº'ÿ©¹rÝööwmczþ§ùúüb]ò?-,×8ÿÓâÂ,ÿÓ_ñlwúIÈ7âcÁ
qÉ4¶[í(qQvºüÙrøÃû9l÷¶Ö7_n)ÇÜHdÞ¹»WX!GÒ¸iâ% ãFµs^Â)BÂU6¿È7ÅjüÔ]²ûáA,Íbñ`¡rívòÈ1cq¬
㣳ebá|ªB-Ö¬rD}GöÒCD&9¤@¶¦n©N¢¼¨2ÀÚDÚéul
ôñBBæøü3§Ì/Ã(ãPhKLñ}ÕªÚÄHÉÎûa8#èÿOþëmø=Ûÿh>þ½\_^¬//<\zôÿÑò,ÿß_òïÕq¿vÒéÕÃìªêGÇ)
÷GX<6´Ä&¾HoªUcì$RìCíDìý_L¸L ÿAÿ¡xÖü¶ä
ë`.8b7ÔÙàªQ«ÁýóÞÐúç5ø×ÐâÁt*ãÄ$Vz¬>|ú=.ÔãÓüóÄá§SÌ%-¢Fj÷ÚÐâóýFH¶.2®mÍ1Hû
ýÝ[ 2Qó8¡úÒãC~~i
þd$þûE8
ÚÜXïk¶±ãLEÞÖ8öÂñ2à´g&òmjËâO0 Ws AþѽT+ÄyCñFfew_¡îÈ÷}µõÛÖÆë4»:ªÂDW«¨¸ZE³íÎ¥D¯·ü®¬Ä/³²lѱ8üuQ0Ó
uÖc/ÀKrÅn8E¨ Ô¡Þ{ÁGôÊäZ
Û{
ÎÀ£oÍ
ì
ö.à.Ø
¿Bd§½®Xì4P7°txT!¯VáÅÂZ~¨õÝî[gN¼|"fô·X©lõTCC\¸Aa{ê ód×"HÒDYR
©~/TxFñÕãU0¦nÁ£õ¾öÞ=-¯Ów(Þ¬â)$*0!±
·´&¦ÖdhJÂTL7 +nïY4Çñðã§N(__ÔC}N6UâJæì~,àÖøtr-óþ3òÄo&IÞ»©Ò¼|kÞÄâUWÞ.N:>ÊäFR¯¤
£´ZPcÇãÁs! EÂ-çl«øª| ÒZækE-nÕÞ¸ýzÐr]÷I:{
o<<á/:û´¯©PU÷35ø=Öxjïú¼J~A^%Ò"bHØ¥sé¼'î-,7RÇs¹T/-С<¥ÉPó¾Â&-XVn'B«óIqè;¶\r±£LøÄ,NPX¡01qã8ûMfb§¹Ô8 a/hVU!ö5¥SáY0ìÂ&y;/£·'qºÕE£§Q{ÉlµD|©m¸¢ÒqSþ&E AvòipÓQÒÞÌz ·>
Ð
N
Q¹±³0qÈ~MGÔ¡ýßwv_í7÷}¦æ¼^C. bÈÕêÁÔçG7úµºõÆ|üª]ZìùÓxÔc.Ï'qv¯ï|kX2:ýÍ&¬yt ½mCÍxOð`c>`Wèp³üG½è*
Èá)°i1)RÁ?ékÐï¡/ñ½7}Æ[ì!o#æ3ÕÁ¡µ³Xí¸æºGG×-¿å?ðxµVël
¶ÎµsY£ÃÃi"ÜÂ1.ÃÏ2ë`K¥º
?$÷ kxXCþ_ãq~ð
/Ñ¿ò¬ÔÏÝ0 tgíH¸ð qXN¹áe½{ÒÌã§Ì×.Ï ~Õø>9ØK0é#Ê|*JKôå5=nÁïv몷®·ÐÅþVúô!VÑµÖ ?8Ôi¨mêÉa¿¼)à¥H .ô®DFÊ£¦¢ËDÎ"ý%DßlUD|ÑU]o×P÷q¿Z»WVˤ,!Y(e[+CLµ7É·nëSðÓÑ8è² 1"aÇÈ£øÙ2h{¾z¥wwú+nÄKä ®[âô/¥ã'
ðÿByæbtur) 5üÃõêÕ?¼j«ÔXH!
ã9k¯hA<䧨[V¼ß¦ùÞiz*m÷¶^íîp\Øýr¦áuæReKp³ö{àõ×?ïîeê-Z1Y ÈxINõmNa¡É] doĵ5¥#
PÙÓY%Þ9*@»zéIÙ=lZ?¬)¯µt7·'LìKwáYçpôPã7_MÝÖBË
ÎÌÝÌ=úõè
]Mºüy´FpÅÞ Óít_~$¬{
çÙβÄkûëIôcú.fYؼîæôòOè[Óê[¶OÛá&MrÃXÏÂD r¥_+_°ºù¤ÂúxßÖÙP%¯¯SÃo íUen¾tÞìÖ
þ¥;ðó"#Ïògfjþ>ç4L˲0òÖ5/> CШæÝEt75æ;®ÌØpqÞ\+Ï×ú¸Z=z²i>Î2`¬Â,?A¦='É1àh0©%R«Áõh´Â
%¢×%4y"IÚBÿ¢²¶íÃtÁ
·gP±iÔI°YÉTJ2¦4
Ëç¹{ÉCtEC×Ü,ÙNåµ-ïZ¤¹ý-µ¾½¿{ËI;éè²5&TOê4¥F©_]QrÞ¬¾&í°aRÌ`5|W¤@$¾býP¤Q^%r$çkøÈÏ1îÒxÐ
5#vÄÉ¢¥)(ÑdûêZzH®´d»¬~¾í=ÛËeBüV« 6w)Ã$r8ø¹¹¯Ð©åÅ¡ák$b>§¸|ùðs¢Æ*h·üVüW«%µN ®uìçQ4éþÉ~{
OµCóàGTvZa+$»7q¿÷ÕÖoë/_Áb¤¿Âhx´ ]ãã+¶@Z±ð!Î:ã·*Ök(½ª0ìke·øbè¦Bî9ê*WªEcõÞ&D ߤqrÔZ¿ÖÔU.U¹j^Ø¿ÿ³*ó¿Ìha78áöØÁV a'Fm¢ea¤½¤:_±ÞÕá]h^Q,F ð=3VØÄhiÕf
`s«JQè%f¶hûV9/@ QÆC#[¯äƽó!`ù~ä
=KPHÓÆdÓ0¶cRÑÑ?é+ú×ÜL.ùÆÞBï¥óü«ùÉÿ$ï]T%57¢6M*ýzæÁ?¯±%ìË¡ê)"¥x#òÆÜHw¦ãvüÐWÛ{¢Gzôùÿ·ºoõK¯ÃpNJ¹¯©Ý9`_(æcW crq;Øãë*0ÑÆIê r©nLYz{Ã+Ês7}\ï@Îű£öyâ.sÌõ
è5£,}vtÁ"àþìP:¾<L8ì«ÍðÐ
wR93.«.z6¦ÐãK¸á6Õ;6Ò
b·Çæ6RúRdÎdù\õ5ÖÒ®ÅÐÑVþj!åHo~ͳìæGdKo¨ãX;sµpõ ©vGK
ó«!Y(¾äÌüj¡©ÂÞÿDx?Ýzd.åÜÖjë¼ùmêRB¬~IfâØt¹×ÔKîUNgQtôQ¿õËì ÙqJGr×ýù½%åôGÍ_¥/_]Nó!èw0g·ht8 E¡]ù6G]9<áoà`¦Nvclü¼ÁÓ$DC57êåHÞð×`R«
ïq§© ><ôIopý&(ĪÆTª'½Q±DϺÀÔ(ÅOl'ÙM1ÛåôXÔLqM©]jîÁõ¼eíÜ
ëÕ¯ø»¢Ü×ÃaZ q
êb@øÓ§àD¼2ãb|çwCûH%×àUÝS%ÛH#+T¾ËÉ£´x²?a?¼êGô_n/ó)mÏRÙtR,Âÿ¸D6Yùo<O¶£óïØÆ-òßÂÂÃ%ÿ-Î?¢ü/ËÍä¿¿âY_ªÎ?¬Öñ8a~
rôzê1:ß>E×íS$ãÌÝ·7:ç´S¹pRô[@Ò/ðr2b&Wwæ4?ñË&Ä=%8Û£¬h
x"êöNBàs:¦Ú¦!p{ÑÀÜßÍqºtYÜ.n
ú²
â«9Ì])
9½:Õ¦\vÁé7úX$n/üè5äÊ0ÝÊWÛ2òý=¬¹ã`tqµ¾P?Tí=®0á
ß¹0B®}æKÇOI
>¾S®Éú$ £^'T!^²ÂOc½:ÿè§Ñäarí ûçÀ.0a9ÔóêO¼SôéÓ Ç5vìFçnøwÓÊÿOöü×kö=Û¸-ÿ[}i)ÿíÑÒìüÿK¢"/+aZNf1
lI§À@²@i/è¿KüBs
êE?^Qâ#B9âàò$`¾¢¨³ÀÿJ{oØ
HÍÓõ#B~w;BÜE¢7ð¨(j
úç:!EªaØcgÈMN (7&UC¹°ÎÎ#dE׺Xg¦K9(ä F1Þ·w*ê<«¤Æ
â¼é]¤Ú;][¨«B9Ë4Þ
¥§Ï¤!¸æãÊN&Jà$å$~2%6§V°|àöwNqµcâåïë{/öaY¡£êZ¡´SE÷ájµ×ª-·zxغ@SGG-Ïúq¿Öª×Îepø|¯5Î}ýÕK3 .
Ïá¬Ú÷V1»Ùle[tÑÕéßgÇ
~Ýtzj4¼ÕÂ>æ
:wn{áKÛ~
ATpß¡ñE«ñâ]ÿ5Ú£/ølOR°Ö
¸yÖM$ztK¼6+6<,8wÅÑ©+
´¶*ÙEe·åà;6Y^2¥ÄÙÒ¤ºñm¬êS
÷Kw·}øL¨fíå¼y;[±àvõ0ó%2vR°r8£7åä2YÙðÙÙMæÔCrk9õÁ'tÑ Ç
'ªýÁÀëkç6Jy Atº3<ëÑâV\óï§oR)xÙ3&æàå«c»'@²1³ö´®ÌÙfßIñ·mÔR¶¯©}w˨r
½7,©lÊ&IðS´Â^^^
Fc Í÷-Y,vnçÖaÞ3ÐräÏæëG;¬¯^Vî4µ
ù4lܼ2íëeÿ¯)K°7fضZÑr¿°¤LYÍÈǵb\ßâS½%'Ö»ßrá%\Ã}Èè§7j²''éäòEÆÛúÇ«¾E'w<ñMH
læhZyö¬{y~±
ÐüÈÓìåÑX¥¹£ö]ù0:%«çX³¢N˹N~ÉÈöÇÍôGvrKi¾ÌÉÑeN=ÇÉÁ2!# u)pÿ´Wáßÿ?Ùüíû¶q[þ?ÌùÉÿ7ÿhÿá/y¬À3 ?2TÛNÚåeÜþ%KãNIÉ@ék¬è2§T:&¦HÇÉ,ïu½ù³¾ü)vÉ[Á1tÄ#8¹¢2³å9t'ÔÃÑa|ÅÍ
:ÂÁ
1bC};\'Dø0»"§}ÉIaß1/Ñùì¾Î°Í¡4ê/îê+ºÆ:¹HòÞcp©xÖ`âÌÌEî´<ØÑijÓjº±²?ä|â
N#;½L²;q2ê[y0-^ÕF+qPÍíªÎé°ô9½0Mc\¯íÈDþäBë4Ö9=½ÇLþóÎÐç''ÿYz$Kkæ[Û¸åü_Ä¿ëËKóëÿéQýa}vþÿOÒ;¤©-µûFåP´ÈÏ\¹&ÎsNÈ!$xtgßÒg>V)eîU¿ÍtG!¹ àXfëVïY¯¿Bþm
=³göÌÙ3{fÏì=³göÌÙ3{fÏì=³göÌÙ3{fÏì=³göÌÙ3{fÏì=³göÌÙ3{fÏì=ÿ¶Ïÿ ûh
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 9 Sep 2004 11:27:09 -0000 1.4
+++ .cvsignore 13 Jan 2006 03:50:11 -0000 1.5
@@ -1,2 +1,3 @@
lsb-release-1.4.tar.gz
redhat-lsb-1.3.tar.bz2
+redhat-lsb-3.0-1.tar.bz2
Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- redhat-lsb.spec 9 Dec 2005 22:42:58 -0000 1.13
+++ redhat-lsb.spec 13 Jan 2006 03:50:11 -0000 1.14
@@ -1,5 +1,5 @@
# Define this to link to which library version
-%define lsbsover 1 2
+%define lsbsover 3
%ifarch %{ix86}
%define ldso ld-linux.so.2
@@ -42,48 +42,49 @@
%define qual %{nil}
%endif
-%define lsbrelver 1.4
+%define lsbrelver 2.0
+%define srcrelease 1
Summary: LSB support for Red Hat Linux
Name: redhat-lsb
-Version: 1.3
-Release: 10.1
+Version: 3.0
+Release: 9
URL: http://www.linuxbase.org/
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{lsbrelver}.tar.gz
+Patch0: lsb-release-2.0-disable-etc-lsb-release.patch
License: GPL
Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-root
# dependency for primary LSB application for v1.3
Provides: lsb = %{version}
-# dependency for primary LSB application for v2.0
+# dependency for primary LSB application for v2.0 and v3.0
%ifarch %{ix86}
-Provides: lsb-core-ia32 = %{version}
+%define archname ia32
%endif
%ifarch ia64
-Provides: lsb-core-ia64 = %{version}
+%define archname ia64
%endif
%ifarch ppc
-Provides: lsb-core-ppc32 = %{version}
+%define archname ppc32
%endif
%ifarch ppc64
-Provides: lsb-core-ppc64 = %{version}
+%define archname ppc64
%endif
%ifarch s390
-Provides: lsb-core-s390 = %{version}
+%define archname s390
%endif
%ifarch s390x
-Provides: lsb-core-s390x = %{version}
+%define archname s390x
%endif
%ifarch x86_64
-Provides: lsb-core-amd64 = %{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}
-%ifarch ia64 ppc64 s390x x86_64
-%define qual ()(64bit)
-%else
-%define qual %{nil}
-%endif
ExclusiveArch: i386 ia64 x86_64 ppc ppc64 s390 s390x
%ifarch %{ix86}
@@ -91,6 +92,7 @@
Requires: libcrypt.so.1
Requires: libc.so.6
Requires: libdl.so.2
+Requires: libgcc_s.so.1
Requires: libm.so.6
Requires: libpthread.so.0
%endif
@@ -100,6 +102,7 @@
Requires: libcrypt.so.1()(64bit)
Requires: libc.so.6.1()(64bit)
Requires: libdl.so.2()(64bit)
+Requires: libgcc_s.so.1()(64bit)
Requires: libm.so.6.1()(64bit)
Requires: libpthread.so.0()(64bit)
%endif
@@ -109,6 +112,7 @@
Requires: libcrypt.so.1
Requires: libc.so.6
Requires: libdl.so.2
+Requires: libgcc_s.so.1
Requires: libm.so.6
Requires: libpthread.so.0
%endif
@@ -118,6 +122,7 @@
Requires: libcrypt.so.1()(64bit)
Requires: libc.so.6()(64bit)
Requires: libdl.so.2()(64bit)
+Requires: libgcc_s.so.1()(64bit)
Requires: libm.so.6()(64bit)
Requires: libpthread.so.0()(64bit)
%endif
@@ -127,6 +132,7 @@
Requires: libcrypt.so.1
Requires: libc.so.6
Requires: libdl.so.2
+Requires: libgcc_s.so.1
Requires: libm.so.6
Requires: libpthread.so.0
%endif
@@ -136,15 +142,17 @@
Requires: libcrypt.so.1()(64bit)
Requires: libc.so.6()(64bit)
Requires: libdl.so.2()(64bit)
+Requires: libgcc_s.so.1()(64bit)
Requires: libm.so.6()(64bit)
Requires: libpthread.so.0()(64bit)
%endif
%ifarch x86_64
-# archLSB X86-64 Base Libraries
+# archLSB AMD64 Base Libraries
Requires: libcrypt.so.1()(64bit)
Requires: libc.so.6()(64bit)
Requires: libdl.so.2()(64bit)
+Requires: libgcc_s.so.1()(64bit)
Requires: libm.so.6()(64bit)
Requires: libpthread.so.0()(64bit)
%endif
@@ -153,9 +161,13 @@
Requires: libpthread.so.0%{qual}
Requires: libgcc_s.so.1%{qual}
Requires: libdl.so.2%{qual}
+Requires: librt.so.1%{qual}
Requires: libcrypt.so.1%{qual}
Requires: libpam.so.0%{qual}
+# LSB Base C++
+Requires: libstdc++.so.6%{qual}
+
# gLSB Utility Libraries
Requires: libz.so.1%{qual}
Requires: libncurses.so.5%{qual}
@@ -163,14 +175,14 @@
# gLSB Graphics Libraries
Requires: libX11.so.6%{qual}
-Requires: libXext.so.6%{qual}
Requires: libSM.so.6%{qual}
Requires: libICE.so.6%{qual}
Requires: libXt.so.6%{qual}
+Requires: libXext.so.6%{qual}
+Requires: libXi.so.6%{qual}
Requires: libGL.so.1%{qual}
# gLSB Command and Utilities
-Requires: /bin/awk
Requires: /bin/basename
Requires: /bin/cat
Requires: /bin/chgrp
@@ -178,24 +190,21 @@
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/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: mailx
Requires: /bin/mkdir
Requires: /bin/mknod
Requires: /bin/mktemp
@@ -225,6 +234,7 @@
Requires: /usr/bin/[
Requires: /usr/bin/ar
Requires: /usr/bin/at
+Requires: /usr/bin/awk
Requires: /usr/bin/batch
Requires: /usr/bin/bc
Requires: /usr/bin/chfn
@@ -235,9 +245,11 @@
Requires: /usr/bin/comm
Requires: /usr/bin/crontab
Requires: /usr/bin/csplit
+Requires: /usr/bin/cut
Requires: /usr/bin/diff
Requires: /usr/bin/dirname
Requires: /usr/bin/du
+Requires: /usr/bin/env
Requires: /usr/bin/expand
Requires: /usr/bin/expr
Requires: /usr/bin/file
@@ -245,7 +257,10 @@
Requires: /usr/bin/fold
Requires: /usr/bin/gencat
Requires: /usr/bin/getconf
+Requires: /usr/bin/gettext
Requires: /usr/bin/groups
+Requires: /usr/bin/gunzip
+Requires: /usr/bin/gzip
Requires: /usr/bin/head
Requires: /usr/bin/iconv
Requires: /usr/bin/id
@@ -253,10 +268,13 @@
Requires: /usr/bin/ipcrm
Requires: /usr/bin/ipcs
Requires: /usr/bin/join
+Requires: /usr/bin/kill
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
@@ -272,13 +290,12 @@
Requires: /usr/bin/paste
Requires: /usr/bin/patch
Requires: /usr/bin/pathchk
+Requires: /usr/bin/pax
Requires: /usr/bin/pr
Requires: /usr/bin/printf
Requires: /usr/bin/renice
-Requires: /usr/bin/rsync
Requires: /usr/bin/split
Requires: /usr/bin/strip
-Requires: /usr/bin/sum
Requires: /usr/bin/tail
Requires: /usr/bin/tee
Requires: /usr/bin/test
@@ -310,6 +327,7 @@
%prep
%setup -q -a 1
+%patch0 -p 0
%build
cd lsb-release-%{lsbrelver}
@@ -318,59 +336,102 @@
%install
rm -rf $RPM_BUILD_ROOT
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/%{_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-%{lsbrelver}
make mandir=$RPM_BUILD_ROOT/%{_mandir} prefix=$RPM_BUILD_ROOT/%{_prefix} install
cd ..
-cat > $RPM_BUILD_ROOT/etc/lsb-release <<EOF
-LSB_VERSION="1.3"
-EOF
+touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.0-%{archname}
+touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.0-noarch
+touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-3.0-%{archname}
+touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-3.0-noarch
for LSBVER in %{lsbsover}; do
ln -s %{ldso} $RPM_BUILD_ROOT/%{_lib}/%{lsbldso}.$LSBVER
done
+mkdir -p $RPM_BUILD_ROOT/bin
+
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
+
+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/usr/sbin/redhat_lsb_trigger.%{_target_cpu}
+
%clean
rm -rf $RPM_BUILD_ROOT
%triggerpostun -- glibc
-%ifnarch %{ix86}
- /sbin/sln %{ldso} /%{_lib}/%{lsbldso} || :
-%else
- if [ -f /emul/ia32-linux/lib/%{ldso} ]; then
- /sbin/sln /emul/ia32-linux/lib/%{ldso} /%{_lib}/%{lsbldso} || :
- else
- /sbin/sln %{ldso} /%{_lib}/%{lsbldso} || :
- fi
-%endif
+if [ -x /usr/sbin/redhat_lsb_trigger.%{_target_cpu} ]; then
+ /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
+fi
%ifarch %{ix86}
%post
# make this softlink again for /emul
if [ -f /emul/ia32-linux/lib/%{ldso} ]; then
- /sbin/sln /emul/ia32-linux/lib/%{ldso} /%{_lib}/%{lsbldso} || :
+ for LSBVER in %{lsbsover}; do
+ /sbin/sln /emul/ia32-linux/lib/%{ldso} /%{_lib}/%{lsbldso}.$LSBVER || :
+ done
fi
%endif
%files
%defattr(-,root,root)
-%config /etc/lsb-release
/etc/redhat-lsb
+%dir /etc/lsb-release.d
+/etc/lsb-release.d/*
%{_mandir}/*/*
%{_bindir}/*
+/bin/mailx
/usr/lib/lsb
/lib/lsb
/%{_lib}/*
+/usr/sbin/redhat_lsb_trigger.%{_target_cpu}
%changelog
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Fri Jan 13 2006 Leon Ho <llch at redhat.com> 3.0-9
+- Migrated back to rawhide
-* Thu Mar 17 2005 Leon Ho <llch at redhat.com> 1.3-10
+* Wed Aug 3 2005 Leon Ho <llch at redhat.com> 3.0-8.EL
+- Added libstdc++.so.6/libGL.so.1 requirement (RH#154605)
+
+* Wed Aug 3 2005 Leon Ho <llch at redhat.com> 3.0-7.EL
+- Fixed multilib problem on lsb_release not to read /etc/lsb-release and solely
+ depends on /etc/lsb-release.d/ (Advised by LSB committee)
+- Removed /etc/lsb-release (Advised by LSB committee)
+
+* Mon Aug 1 2005 Leon Ho <llch at redhat.com> 3.0-6.EL
+- Made the /etc/lsb-release useful (RH#154605)
+- Added redhat_lsb_trigger to fix RH#160585 (Jakub Jelinek)
+- Fixed AMD64 base libraries requirement parsing (RH#154605)
+
+* Fri Jul 29 2005 Leon Ho <llch at redhat.com> 3.0-5.EL
+- Fixed redhat-lsb's mkredhat-lsb on fetching lib and cmd requirements (RH#154605)
+- Changed explicit mailx command requirement to package requirements (RH#164124)
+- Added mailx symlink to /bin/mail (RH#164124)
+- Added lsb-core-noarch and lsb-graphics-noarch and lsb-graphics-{arch} requirements (RH#164468)
+- Added requirements from lsb_release command on lsb-release.d and deps. (RH#164468)
+
+* Mon Jul 18 2005 Leon Ho <llch at redhat.com> 3.0-4.EL
+- Rebuilt
+
+* Tue Jul 05 2005 Leon Ho <llch at redhat.com> 3.0-3.EL
+- Disabled support for LSB 1.3 and 2.0
+
+* Mon Jun 20 2005 Leon Ho <llch at redhat.com> 3.0-2.EL
+- Upgraded to lsb-release 2.0
+
+* Thu Jun 09 2005 Leon Ho <llch at redhat.com> 3.0-1.EL
+- Moved to LSB 3.0
+
+* Wed Apr 13 2005 Leon Ho <llch at redhat.com> 1.3-10
+- Fixed ix86 package with ia32 emul support
* Tue Feb 01 2005 Leon Ho <llch at redhat.com> 1.3-9
- Sync what we have changed on the branches
@@ -423,4 +484,3 @@
* Thu Jan 24 2002 Matt Wilson <msw at redhat.com>
- Initial build.
-
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 9 Sep 2004 11:28:17 -0000 1.6
+++ sources 13 Jan 2006 03:50:11 -0000 1.7
@@ -1,2 +1,3 @@
30537ef5a01e0ca94b7b8eb6a36bb1e4 lsb-release-1.4.tar.gz
f535414957ea3f7810b098f4ac7e4c50 redhat-lsb-1.3.tar.bz2
+6dc78435cc0837d9d75f7298587787bc redhat-lsb-3.0-1.tar.bz2
More information about the fedora-cvs-commits
mailing list