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ÙÑ#HIÄ ÀÃ
g±²LnÊ8ÓõG«;ÇÈMóÊ䉵ªã2Æ߆Òß;Šž)Oó›7X²!:methÃŽ µÌ(Ä­®-l£G’H­ê’¦=iñv›Aøt8ˇu`ºV¢Z+ùÑÌ™›8ßéï”z[«2Þè—uA;×Õº(-¤´`¥ª­¨$N‹q¯½f‘æÌâ›ï”ö]:/ãr§_á,Ímeâ¤w¦õSQëEœ3³;-Ä°èÅ,ŠYÍ—µÉõ»5ñW’KÕ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,KC’ZYÙ˜§‰‚±Rx"ašœ]Ý";ádÒö«<*H+%9nÉʪžšÉ;SàÒ6‹+Þ|aÊ*ÃX±ÅÃtžfi•º8D;‹DÕQ†’Œˆ"'þM‘¤K2_Å
˜o1Eéȯ8º­k{‘CVkCn§ðW•2Ç3ôÒ`#>¹W¯Rg°Ž[åÅ•V
,Wr#M¶Ú/ãw÷̯ìØÁ¢ÆÔóÂSXöéÃ$:ì&5oÈ*ƒxW1ü+-•W
ù°9f%°ûj­«è´2[û›>=?ã¼$i²+u˜¥:½8ƒüàçÎL‚Ìô²N!T’‘凙YÁÍ9ãYÎÆ.åE¡†±çOœ†XáyLu?³éÂĤ1Ÿˆ·ŽÚ•œ‰Á³7zƒw§XàÆgáš@*Ol£
	§y÷KÊB;>’¹ë$(b¸<È1L|ÊqŸob2+É`[‹G„^ŒrцrÊ@Ì‹76 ŸÓéÄ*Ió8‹p†°DI‚@jßp.-‹¤^œDH»°NÚ
ØM¬>Aî8£ôÞŸ N®¬^ó‹“&	x¶Y¬Ã™ÃG	±ŒÊêʦìòÈ ØÝ›JLÑr©Ê:?½Êé˜$rˆwCE(6á+*
hWp[»ªj´$•ƒW‡cj×;çÈœ]‹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¤ÎàÁ0jˆoÔwªW¤ÚÒãAfÍÙBÚ!ø€‹Oa«4«¸LXÿxI¿Pš–æØ/FÁ5QÊý÷ª	˜NNœŒý?ª¶Raëˤº+éF(€‰•F
;( Šp.£n†/§ìQ(
ßA‚’kºì°‚òØ­ØÄ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^æ·¨qcuT–C.¥´wô´žûì0éºré\-Û "1¡…¯E›&sÒ"ºŒsÚneyòè

!ÑÒ‘k\_NW|ºéïcèÂç8¤¦Z)m«TvYm¹2‰­-©oˆÁb2|³LóTz­Tg¹õ‡Ët+7Ê”°•Ï_D\êúd{¨CžeqZŽÀå-ÿLB'l§ìְƍ³Ñ?¡»ðe
׏£Û<¾lZ=
¨
_;¥²]Ú…ngÈhΈ"=µž°‰ÿd°E3:=‰â¯0c“	4±Æχ
9ª”¢ÕîlèÆM&
¼]þ©R‚TëœqÓÜ¥l‡r£¹+=$ùåZv'ˆx
H”2Žñ‹–NŸþþ€ú5úTn›7©›-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¦O‘DRüVÆ3¼õo¹%OÓúžõh
µnFrÔŠæ:àÖuÜ1M)þBWø%ßAÒtßI&QÞÚ9t¹š„§]</rix[œ<ײj¶`‰_ú蚨õ¶¹îå!ªŸ’"$È>	O–ò¨•¶k¶ƒœÞ;Í‚†VO_Œ‘2~ÒÌK¸0è2¡âu‘2&œíyMh¦<G„Ò)ÔÝç§W$Î!ó,07‡ÙJ²ª­Â3ïù˵ý>ÅOnêu/b¥6Ÿ ë?Ê…QIAËU§d+­õÏwíÍVX§KŒnáÈÁ,EE.½l‡ŽÃ2€#zœ$Òw #€ºW†–o×|ƒÞ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;1†7í%íóÏ~þئXÃ.Ыg ó¬™.ØV°œvFîH„ô¿b"0ÄTHêÝ.yj—N`´Döœ†É½Ã1½ž8&Àh‚ GKEQ¼(gÅ2tT¬Ûx8R¤üD&÷ËŒ™Ìå
ʳ€ëÓX`ªŸé¯|u<¿ã`P"©lT£1&׳Dn9DWµ~Ôƒq< 0ÿ@ø:]Ö{¦Ü5Rî©MuTI€óØ7½ÝÎ;&¦y?B9"N1‡T¤]a…âNõ¢öfí5~?ú©’Ùθ›•Jïå±ê§ KHéú³ýÝmà=¶·ùæÂ	A5‚¿¥ØՏe?ÙYzœ=t„]l'6C‚DRí‘ÈVìæNËvG|v\¹]¡˜GV®Äç[÷ú`jþê¸ÛTlIJŠœ}¶{F†±…$í‘á8FçÕhq#{0Hi¤_°BŸr»&‘L¬§§ý:—€¬žBÞ‘Zã2ì
aÂÂ˸ZEJN¢t<ì°]×DüK‰–\ó0™ŠàN‰FPÍÕqïÆYj_†}Oq$w߉Q€ï²¥£ÇþìhjÆ0ºD5—à’8ÍtÎœÊǯù³ø©èE›v…}¨¨¢)G[ü¢ö¨ê=ŽgâÉÈ4ÄÞAIh‹ ‡"$X@o-</£yŒ<a;ÆÐ+ñSA7˜Ø3*5hì¿°7êçàô]Ø'ø˜I0ô°ä`[-ê­UTxµ~§KyHiáÌ×wt„×/€A¢×@v–EìF‰†ñÇ^_Òm8V¬I9`Œl}›h¢íGh¡FjC‰%ŒŠÆÑÞ៉dŸÏ*2>rO€Ñ ß.»EK¯¯G€k…ÚITu·¡Óñ39¹.œü\ãªÍ¿;Íìùº'›ÿ©¹rÝööwmczþ§ùúüb]ò?-,×8ÿÓâÂ,ÿÓ_ñlwúIÈ™7â“cÁ
qÉ4¶[í•(qQŠvºüÙrø„Ãû9l÷¶Ö7_n)ÇÜHdÞ¹»WXž†!GÒ¸iâ% ãFµŠ„‹s^Â)BÂU6¿È7Åj­üÔ]²ûá‹A,Íbñ`„¡rív•òÈ1Šcq¬
㣳ebáš|ŠªB-œÖ¬rD}Gö–ÒCD&­ƒ9¤@¶¦n†©N¢¼¨2žÀÚDÚéul…ôñBBæøü3§Ìœ/Ã(ãšPhKL‚ñ}ÕªÚÄHÉÎûa8#èÿO–þëmø=Û˜žÿh>þ½\_^¬//<\z„ôÿÑò,ÿß_òïÕ†q¿vÒéÕ€ÃìªêGÇ)
÷G‰X<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üuQ0žÓ
uÖc/ÀKrÅn8E¨ Ô¡Þ{ˆÁGôÊäZ
Û{
ÎœÀ£o͝
•‘ì
ö.à.™Ø
¿Bd§½®Xì4P7°txT!‘¯VáÅÂZ­~¨õ†Ýî[gN¼|"ˆfô·X©lõTCC\¸Aa{ê	ód×"HÒD­šYR…ž©~/TxFñÕŠãU0¦nÁ£õ¾öÞ=-¯‚Ów(Þ¬šâ)‘š$*0!±
·´&¦‰œÖd‡hJÂTL”7	+nïY4Çñð’ã§N(__ÔC}N6U‘âJæì~,àÖø—tr-óþ3ˆòÄo&IÞ»©Ò¼|kÞÄâU•WÞ.N:>ÊäFR¯¤…£´‘ZPcÇãÁ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/h­VU!ö5¥S›áY0ìÂ&y;/£·'qº–ÕE£œ§Q{ÉlµD€|©m¸Š¢ÒqSþ&E A—vòipÓQÒžÞÌz ·>
Ð…N
Q¹ƒ±³0qÈ~MGÔ¡ýßwv_í7÷}¦™æ¼^’C. b‡„ÈÕêÁÔçG7­úµºõˆÆ|üª]ZìùÓxÔc.Ï'ŒqvŒ¯—ï‹|kX2:ýÍ&¬yt ½mCÍxOð`c>`Wèp³™üG½è*
ÈŒ‘á)°†i1)œRÁ?ékÐï¡/ñ½7­}Æ[ì!o#æ3ÕŸÁŽ¡µœ³Xí¸æº‡G‡G×-¿å?ðxµVël
¶Îšµs†Y£šÃÃi€"ÜÂ1‚.ÃÏ2ÃÂ’ž«`ŽK¥º
„?$÷ kxŸXCþ_ã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¯—hŒA‘<ä§¨[V¼ßˆ¦ù†Þiƒz*m÷¶^íîp\Ø‹ýr¦áuæReKp‹†‘³ö{àõ×?ïîeê-Z1Y ÈxINõmNa¡É]	doĵ5¥#
PÙÓY“%‘ސƒ9*@»zéIÙ=l•Z?¬)¯µŸt7·'LìKwáYç“pœô†Pã7_MÝÖBË
ÎÌÝ̏=úŸõè…]Mºüy´FpÅÞ Ó†ít_›š~$¬{…çÙβĀŒkû­ëIôcú.fYؼîæôòOè[Óê[¶OÛá&M‹r‰ÃXÏÂD r¥_+_°º“ùœ¤ÂúxßÖÙP%‹¯¯SÃo	íUŸen¾tÞìÖ
þ¥;ðó"#σògfjþ>ç4LË€²0òÖ5/>	CШæÝEt‚75æ;®ÌØpqÞ\+Ï­‚×ú¸Z=z€²i>Î2`¬Â,?A¦˜='Éž1àh0©%R«Áõh´Â
%¢×%4y"IÚœBÿ¢²¶íÞtÁ
­·gPŸ±iÔI°YÉTJ•2¦‘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óàG—TvZa+$»7q¿÷ÕÖoë/_Áb¤¿Âhx´	“]ãã+¶@Z±ð“!”Î:ã·*Ö™k(ƒ½ª0ìk–e·ø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Û{¢žG‘zôùÿ·º†oõK¯‚Ãp’NJž¹¯©Ý9œ`_­(æcW	crˆq;Øã’ë*0ÑÆI˜ê r©nLYz{Ã+Ê‹sž7}\ï’™@Îű£öyâ.sÌõ
è5£,˜}vtÁ"àþìP:š¾<ˆL8Žì«ÍðÐ…wR’93.«.z€6¦ÐãK¸á6Õ;6Ò
b·Çæ6RúRd‘ÎdŽù\õ5ÖÒ®ÅЊÑV€þj!åHo~ͳìæGdKo¨†ãX;sµpõ‰	©v‚GK
ó«!Y(¾äÌüj¡©ÂÞÿDx?Ýzd.åÜÖjë¼ùmêRB¬~IfâØt¹×ÔKîUNgQtô“Q¿õË‘ì	ÙqJGr×ýù½%åôGÍ_¥/_ˆ‡]N‰ó!èw0g·h„t8 €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Ç
~Ýtzj4¼ÕÂ>æ
Ÿ: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æÔCrkŽ9õÁ'tÑ Ç…'ªý˜ÁÀëk„‰ç6‹Jy Atº3<ëÑâV\óï§oR)xÙ3&æàå«c»'@²1³ö´®ÌÙfßIñ·mÔR¶¯©}w˨r
½7,©lÊ&IðS´Â^^^
F’c ÍŸ÷-Y,‰v‚nçÖaÞ3ÐräÏŒæë—G’;¬¯^•Vî4µ
ù4lܼŸ2íëeÿ¯)K’°7fضZÑr¿°¤LYÍÈǵˆb\ßâS„½%'ŠÖž»ßrá%\Ã}È™žèƒ§7j²''éäòEÆÛúÇ«¾E'›†w‹<ñMH
læhZšyö¬{y~±
ÐüÈÓìå‚ÑX¥¹£”ö]ù0:ˆ%«çX³¢N˹NŽ~ÉȁöÇÍôG‹vr”Ki¾ÌÉÑ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$K˜kæ[Û¸åüŸ_Ä¿—ëË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