[Momonga-devel.ja:01315] Re: GKrellM2


In <20030130.024700.574351821.yone@xxxxxxxxxxxxxxxxxxxxxx>(Thu, 30 Jan 2003 02:47:00 +0900 (JST))
  Yonekawa Susumu <yone@xxxxxxxxxxxxx> writes:

>   新しい GKrellM を使いたくなって、gkrellm.spec を GKrellM2 対応にして
> みました。よろしければ使ってください。

  ごめんなさい。diff のつもりで spec そのものを添付してしまいました。
  念のため、diff 形式のものを添付します。(それも デカくてごめんんさい)

-- 
米川
Index: gkrellm.spec
===================================================================
RCS file: /home/cvs/pkgs/gkrellm/gkrellm.spec,v
retrieving revision 1.34
diff -u -r1.34 gkrellm.spec
--- gkrellm.spec	9 Nov 2002 03:39:47 -0000	1.34
+++ gkrellm.spec	29 Jan 2003 17:55:51 -0000
@@ -2,757 +2,92 @@
 
 Summary: GNU (or Gtk) Krell Monitors (or Meters)
 Name: gkrellm
-Version: 1.2.13
-Release: 2m
+Version: 2.1.7
+Release: 1m
 License: GPL
 Group: Applications/System
-Source0: http://web.wt.net/~billw/%{name}/%{name}-%{version}.tar.gz
+Source0: http://web.wt.net/~billw/%{name}/%{name}-%{version}.tar.bz2
 
 # Plugins
-Source100: http://www.geocities.com/saintdead/aflag_anim-0.1.tar.gz
-%if %nosrc
-NoSource: 100
-%endif
-Source101: http://www.geocities.com/saintdead/earth_anim-0.3.tar.gz
-%if %nosrc
-NoSource: 101
-%endif
-Source102: http://eric.bianchi.free.fr/gkrellm/gkrellmitime-0.4.tar.gz
+Source102: http://eric.bianchi.free.fr/gkrellm/gkrellmitime-1.0.tar.gz
 %if %nosrc
 NoSource: 102
 %endif
-Source103: http://telia.dl.sourceforge.net/gkrellkam/gkrellkam_0.3.4.tar.gz
+Source103: http://telia.dl.sourceforge.net/sourceforge/gkrellkam/gkrellkam_2.0.0.tar.gz
 %if %nosrc
 NoSource: 103
 %endif
-Source104: http://ssl.usu.edu/paul/gkrellmouse/gkrellmouse_0.0.2.tar.gz
-%if %nosrc
-NoSource: 104
-%endif
-Source106: http://telia.dl.sourceforge.net/gkrellmoon/gkrellmoon-0.3.tar.gz
+Source106: http://telia.dl.sourceforge.net/sourceforge/gkrellmoon/gkrellmoon-0.6.tar.gz
 %if %nosrc
 NoSource: 106
 %endif
-Source107: http://members.dingoblue.net.au/~gefdavis/gktaskman/files/gktaskman-0.0.7.tar.gz
-%if %nosrc
-NoSource: 107
-%endif
-Source108: http://gkrellmping.dweb.ro/downloads/gkrellmPing-0.2-3.tar.bz2
-%if %nosrc
-NoSource: 108
-%endif
-Source109: http://www.geocities.com/m_muthukumar/gkrellaclock-0.2.tar.gz
+Source109: http://www.geocities.com/m_muthukumar/gkrellaclock-0.3.2.tar.gz
 %if %nosrc
 NoSource: 109
 %endif
-Source110: http://unc.dl.sourceforge.net/sourceforge/gkrellstock/gkrellstock-0.4.tar.gz
+Source110: http://unc.dl.sourceforge.net/sourceforge/gkrellstock/gkrellstock-0.5.tar.gz
 %if %nosrc
 NoSource: 110
 %endif
-Source111: http://telia.dl.sourceforge.net/sourceforge/gkrellshoot/gkrellshoot-0.3.11.tar.gz
+Source111: http://telia.dl.sourceforge.net/sourceforge/gkrellshoot/gkrellshoot-0.4.1.tar.gz
 %if %nosrc
 NoSource: 111
 %endif
-Source112: http://web.wt.net/~billw/gkrellm/Plugins/gkrellmwho-0.4.tar.gz
-%if %nosrc
-NoSource: 112
-%endif
-Source113: http://www.peuchert.de/projects/gkPCcard/gkPCcard_r0.5.tar.bz2
+Source113: http://www.peuchert.de/projects/gkPCcard/gkPCcard_r1pre1.tar.bz2
 %if %nosrc
 NoSource: 113
 %endif
-Source114: http://asdfnews.org/yargon/gkx86info0.0.2.tar.gz
+Source114: http://anchois.free.fr/gkx86info0.0.2.tar.gz
 %if %nosrc
 NoSource: 114
 %endif
-Source115: http://horus.comlab.uni-rostock.de/flynn/gkrellflynn-0.4.tar.bz2
+Source115: http://horus.comlab.uni-rostock.de/flynn/gkrellflynn-0.6.tar.gz
 %if %nosrc
 NoSource: 115
 %endif
-Source116: http://telia.dl.sourceforge.net/ibam/ibam-0.2.tar.gz
-%if %nosrc
-NoSource: 116
-%endif
-Source117: http://gkrellm.luon.net/files/gkrellmwireless-0.2.2.tar.gz
+Source117: http://gkrellm.luon.net/files/gkrellmwireless-2.0.2.tar.gz
 %if %nosrc
 NoSource: 117
 %endif
-Source118: http://gkrellm.luon.net/files/volume-0.8.tar.gz
+Source118: http://gkrellm.luon.net/files/gkrellm-volume-2.1.7.tar.gz
 %if %nosrc
 NoSource: 118
 %endif
-Source119: http://gkrellm.luon.net/files/gkrellmms-0.5.7.tar.gz
+Source119: http://gkrellm.luon.net/files/gkrellmms-2.1.7.tar.gz
 %if %nosrc
 NoSource: 119
 %endif
-Source120: http://www.engr.orst.edu/~simonsen/reminder/reminder-0.3.2.tar.gz
+Source120: http://web.wt.net/~billw/gkrellm/Plugins/gkrellm-reminder-2.0.0.tar.gz
 %if %nosrc
 NoSource: 120
 %endif
-Source121: http://nwalsh.com/hacks/gkrellsun/gkrellsun-0.2.tar.gz
+Source121: http://telia.dl.sourceforge.net/sourceforge/gkrellsun/gkrellsun-0.9.1.tar.gz
 %if %nosrc
 NoSource: 121
 %endif
-Source122: http://telia.dl.sourceforge.net/gkrellmlaunch/gkrellmlaunch-0.3.tar.gz
+Source122: http://telia.dl.sourceforge.net/sourceforge/gkrellmlaunch/gkrellmlaunch-0.5.tar.gz
 %if %nosrc
 NoSource: 122
 %endif
-Source123: http://triq.net/gkrellm/gkrellm_snmp-0.18.tar.gz
+Source124: http://heim.ifi.uio.no/~oyvinha/gkleds/gkleds-0.8.1.tar.gz
 %if %nosrc
-NoSource: 123
+NoSource: 124
 %endif
 
 # Themes
-Source200: http://www.muhri.net/gkrellm/ClockworkCobalt.tar.gz
-%if %nosrc
-NoSource: 200
-%endif
-Source201: http://www.muhri.net/gkrellm/Skirellm.tar.gz
-%if %nosrc
-NoSource: 201
-%endif
-Source202: http://www.muhri.net/gkrellm/thinsys.tar.gz
-%if %nosrc
-NoSource: 202
-%endif
-Source203: http://www.muhri.net/gkrellm/gkrellm-qn-x11.tar.gz
-%if %nosrc
-NoSource: 203
-%endif
-Source204: http://www.muhri.net/gkrellm/myway.tar.gz
-%if %nosrc
-NoSource: 204
-%endif
-Source205: http://www.muhri.net/gkrellm/Jewel_gkrellm.tar.gz
-%if %nosrc
-NoSource: 205
-%endif
-Source206: http://www.muhri.net/gkrellm/Evilution.tar.gz
-%if %nosrc
-NoSource: 206
-%endif
-Source207: http://www.muhri.net/gkrellm/BlueStorm.tar.gz
-%if %nosrc
-NoSource: 207
-%endif
-Source208: http://www.muhri.net/gkrellm/Acqua.gkrellm.tar.gz
-%if %nosrc
-NoSource: 208
-%endif
-Source209: http://www.muhri.net/gkrellm/Acqua-Graphite.gkrellm.tar.gz
-%if %nosrc
-NoSource: 209
-%endif
-Source210: http://www.muhri.net/gkrellm/invisible.tar.gz
-%if %nosrc
-NoSource: 210
-%endif
-Source211: http://www.muhri.net/gkrellm/H2O.tar.gz
-%if %nosrc
-NoSource: 211
-%endif
-Source212: http://www.muhri.net/gkrellm/Operational.tar.gz
-%if %nosrc
-NoSource: 212
-%endif
-Source213: http://www.muhri.net/gkrellm/adept.tar.gz
-%if %nosrc
-NoSource: 213
-%endif
-Source214: http://www.muhri.net/gkrellm/SentiEnce.gkrellm.tar.gz
-%if %nosrc
-NoSource: 214
-%endif
-Source215: http://www.muhri.net/gkrellm/D.A.E.gkrellm.tar.gz
-%if %nosrc
-NoSource: 215
-%endif
-Source216: http://www.muhri.net/gkrellm/SQR01.tar.gz
-%if %nosrc
-NoSource: 216
-%endif
-Source217: http://www.muhri.net/gkrellm/Glass-2.tar.gz
-%if %nosrc
-NoSource: 217
-%endif
-Source218: http://www.muhri.net/gkrellm/Glass.gkrellm.tar.gz
-%if %nosrc
-NoSource: 218
-%endif
-Source219: http://www.muhri.net/gkrellm/Crux_chaos.tar.gz
-%if %nosrc
-NoSource: 219
-%endif
-Source220: http://www.muhri.net/gkrellm/dirtchamber.gkrellm.tar.gz
-%if %nosrc
-NoSource: 220
-%endif
-Source221: http://www.muhri.net/gkrellm/spiff.tar.gz
-%if %nosrc
-NoSource: 221
-%endif
-Source222: http://www.muhri.net/gkrellm/Yellow.tar.gz
-%if %nosrc
-NoSource: 222
-%endif
-Source223: http://www.muhri.net/gkrellm/New-Found.gkrellm.tar.gz
-%if %nosrc
-NoSource: 223
-%endif
-Source224: http://www.muhri.net/gkrellm/Dune-GKrellM.tar.gz
-%if %nosrc
-NoSource: 224
-%endif
-Source225: http://www.muhri.net/gkrellm/greenHeart_gkrellm.tar.gz
-%if %nosrc
-NoSource: 225
-%endif
-Source226: http://www.muhri.net/gkrellm/Nebulon-GKrellM.tar.gz
-%if %nosrc
-NoSource: 226
-%endif
-Source227: http://www.muhri.net/gkrellm/krooks.tar.gz
-%if %nosrc
-NoSource: 227
-%endif
-Source228: http://www.muhri.net/gkrellm/Oregano.tar.gz
-%if %nosrc
-NoSource: 228
-%endif
-Source229: http://www.muhri.net/gkrellm/BlueMask-gkrellm.tar.gz
-%if %nosrc
-NoSource: 229
-%endif
-Source230: http://www.muhri.net/gkrellm/Snowy.gkrellm.tar.gz
-%if %nosrc
-NoSource: 230
-%endif
-Source231: http://www.muhri.net/gkrellm/Azteker2k.gkrellm.tar.gz
-%if %nosrc
-NoSource: 231
-%endif
-Source232: http://www.muhri.net/gkrellm/BrassAlloy-gkrellm.tar.gz
-%if %nosrc
-NoSource: 232
-%endif
-Source233: http://www.muhri.net/gkrellm/bk10.gkrellm.tar.gz
-%if %nosrc
-NoSource: 233
-%endif
-Source234: http://www.muhri.net/gkrellm/Eazel.gkrellm.tar.gz
-%if %nosrc
-NoSource: 234
-%endif
-Source235: http://www.muhri.net/gkrellm/Veg9000.tar.gz
-%if %nosrc
-NoSource: 235
-%endif
-Source236: http://www.muhri.net/gkrellm/HifiII.tar.gz
-%if %nosrc
-NoSource: 236
-%endif
-Source237: http://www.muhri.net/gkrellm/chaos.gkrellm.tar.gz
-%if %nosrc
-NoSource: 237
-%endif
-Source238: http://www.muhri.net/gkrellm/Jose_Helix.tar.gz
-%if %nosrc
-NoSource: 238
-%endif
-Source240: http://www.muhri.net/gkrellm/black.tar.gz
-%if %nosrc
-NoSource: 240
-%endif
-Source241: http://www.muhri.net/gkrellm/E17.gkrellm.tar.gz
-%if %nosrc
-NoSource: 241
-%endif
-Source242: http://www.muhri.net/gkrellm/Plastique.tar.gz
-%if %nosrc
-NoSource: 242
-%endif
-Source243: http://www.muhri.net/gkrellm/Mozilla-modern.tar.gz
-%if %nosrc
-NoSource: 243
-%endif
-Source244: http://www.muhri.net/gkrellm/K5-FVWM.tar.gz
-%if %nosrc
-NoSource: 244
-%endif
-Source245: http://www.muhri.net/gkrellm/Win-Whistle.gkrellm.tar.gz
-%if %nosrc
-NoSource: 245
-%endif
-Source246: http://www.muhri.net/gkrellm/Evolution.tar.gz
-%if %nosrc
-NoSource: 246
-%endif
-Source247: http://www.muhri.net/gkrellm/blueHeart_v1.2_gkrellm.tar.gz
-%if %nosrc
-NoSource: 247
-%endif
-Source248: http://www.muhri.net/gkrellm/HeliX-Sweetpill.gkrellm.tar.gz
-%if %nosrc
-NoSource: 248
-%endif
-Source249: http://www.muhri.net/gkrellm/Jose_Goes_To_Town.tar.gz
-%if %nosrc
-NoSource: 249
-%endif
-Source250: http://www.muhri.net/gkrellm/eSlate_gkrellm.tar.gz
-%if %nosrc
-NoSource: 250
-%endif
-Source251: http://www.muhri.net/gkrellm/eFVWM.tar.gz
-%if %nosrc
-NoSource: 251
-%endif
-Source252: http://www.muhri.net/gkrellm/eLap.tar.gz
-%if %nosrc
-NoSource: 252
-%endif
-Source253: http://www.muhri.net/gkrellm/Sham.tar.gz
-%if %nosrc
-NoSource: 253
-%endif
-Source254: http://www.muhri.net/gkrellm/tiny.gkrellm.tar.gz
-%if %nosrc
-NoSource: 254
-%endif
-Source255: http://www.muhri.net/gkrellm/Monk.tar.gz
-%if %nosrc
-NoSource: 255
-%endif
-Source256: http://www.muhri.net/gkrellm/ModernII.gkrellm.tar.gz
-%if %nosrc
-NoSource: 256
-%endif
-Source257: http://www.muhri.net/gkrellm/Runes-GKrellM.tar.gz
-%if %nosrc
-NoSource: 257
-%endif
-Source258: http://www.muhri.net/gkrellm/MeLike-gkrellm.tar.gz
-%if %nosrc
-NoSource: 258
-%endif
-Source259: http://www.muhri.net/gkrellm/antarctic.gkrellm.tar.gz
-%if %nosrc
-NoSource: 259
-%endif
-Source260: http://www.muhri.net/gkrellm/minEguE_lite.tar.gz
-%if %nosrc
-NoSource: 260
-%endif
-Source261: http://www.muhri.net/gkrellm/null-gkrellm.tar.gz
-%if %nosrc
-NoSource: 261
-%endif
-Source262: http://www.muhri.net/gkrellm/ShinyAll2.tar.gz
-%if %nosrc
-NoSource: 262
-%endif
-Source263: http://www.muhri.net/gkrellm/minE-Gkrellm.tar.gz
-%if %nosrc
-NoSource: 263
-%endif
-Source264: http://www.muhri.net/gkrellm/minegue-beta.tar.gz
-%if %nosrc
-NoSource: 264
-%endif
-Source265: http://www.muhri.net/gkrellm/Matrix_Green.gkrellm.tar.gz
-%if %nosrc
-NoSource: 265
-%endif
-Source266: http://www.muhri.net/gkrellm/Birth-gkrellm.tar.gz
-%if %nosrc
-NoSource: 266
-%endif
-Source267: http://www.muhri.net/gkrellm/ZixSaw2-gkrellm.tar.gz
-%if %nosrc
-NoSource: 267
-%endif
-Source268: http://www.muhri.net/gkrellm/STPShiny-gkrellm.tar.gz
-%if %nosrc
-NoSource: 268
-%endif
-Source269: http://www.muhri.net/gkrellm/Maw-gkrellm.tar.gz
-%if %nosrc
-NoSource: 269
-%endif
-Source270: http://www.muhri.net/gkrellm/Modern.tar.gz
-%if %nosrc
-NoSource: 270
-%endif
-Source271: http://www.muhri.net/gkrellm/ZixSaw-gkrellm.tar.gz
-%if %nosrc
-NoSource: 271
-%endif
-Source272: http://www.muhri.net/gkrellm/DarkAlloy.tar.gz
-%if %nosrc
-NoSource: 272
-%endif
-Source273: http://www.muhri.net/gkrellm/DreamWorks.tar.gz
-%if %nosrc
-NoSource: 273
-%endif
-Source274: http://www.muhri.net/gkrellm/ShinyMetal-Blue.tar.gz
-%if %nosrc
-NoSource: 274
-%endif
-Source275: http://www.muhri.net/gkrellm/brushedmetalnew.tar.gz
-%if %nosrc
-NoSource: 275
-%endif
-Source276: http://www.muhri.net/gkrellm/Thin-SkE.gkrellm.tar.gz
-%if %nosrc
-NoSource: 276
-%endif
-Source277: http://www.muhri.net/gkrellm/indiglow_blue-gkrellm.tar.gz
-%if %nosrc
-NoSource: 277
-%endif
-Source278: http://www.muhri.net/gkrellm/arctic-3.gkrellm.tar.gz
-%if %nosrc
-NoSource: 278
-%endif
-Source279: http://www.muhri.net/gkrellm/greyNeOn.gkrellm.tar.gz
-%if %nosrc
-NoSource: 279
-%endif
-Source280: http://www.muhri.net/gkrellm/copper-gkrellm.tar.gz
-%if %nosrc
-NoSource: 280
-%endif
-Source281: http://www.muhri.net/gkrellm/x17.tar.gz
-%if %nosrc
-NoSource: 281
-%endif
-Source282: http://www.muhri.net/gkrellm/stirling.gkrellm.tar.gz
-%if %nosrc
-NoSource: 282
-%endif
-Source283: http://www.muhri.net/gkrellm/WireFrameII.tar.gz
-%if %nosrc
-NoSource: 283
-%endif
-Source284: http://www.muhri.net/gkrellm/Beta.gkrellm.tar.gz
-%if %nosrc
-NoSource: 284
-%endif
-Source285: http://www.muhri.net/gkrellm/CaiusWM.tar.gz
-%if %nosrc
-NoSource: 285
-%endif
-Source286: http://www.muhri.net/gkrellm/cyrus.gkrellm.tar.gz
-%if %nosrc
-NoSource: 286
-%endif
-Source287: http://www.muhri.net/gkrellm/Cheese.tar.gz
-%if %nosrc
-NoSource: 287
-%endif
-Source288: http://www.muhri.net/gkrellm/GTKStep-gkrellm.tar.gz
-%if %nosrc
-NoSource: 288
-%endif
-Source289: http://www.muhri.net/gkrellm/UltraFuture_gkrellm.tar.gz
-%if %nosrc
-NoSource: 289
-%endif
-Source290: http://www.muhri.net/gkrellm/JMswing.tar.gz
-%if %nosrc
-NoSource: 290
-%endif
-Source291: http://www.muhri.net/gkrellm/matrix_feeling-0.1.tar.gz
-%if %nosrc
-NoSource: 291
-%endif
-Source292: http://www.muhri.net/gkrellm/arctic-Bordered.tar.gz
-%if %nosrc
-NoSource: 292
-%endif
-Source293: http://www.muhri.net/gkrellm/arctic-Bordered-2.tar.gz
-%if %nosrc
-NoSource: 293
-%endif
-Source294: http://www.muhri.net/gkrellm/Illumination.tar.gz
-%if %nosrc
-NoSource: 294
-%endif
-Source295: http://www.muhri.net/gkrellm/m0kH4.tar.gz
-%if %nosrc
-NoSource: 295
-%endif
-Source296: http://www.muhri.net/gkrellm/NoBevel-gkrellm.tar.gz
-%if %nosrc
-NoSource: 296
-%endif
-Source297: http://www.muhri.net/gkrellm/nIx_gkrellm.tar.gz
-%if %nosrc
-NoSource: 297
-%endif
-Source298: http://www.muhri.net/gkrellm/Viridis_gkrellm.tar.gz
-%if %nosrc
-NoSource: 298
-%endif
-Source299: http://www.muhri.net/gkrellm/arctic-2.gkrellm.tar.gz
-%if %nosrc
-NoSource: 299
-%endif
-Source300: http://www.muhri.net/gkrellm/SolarE.gkrellm.tar.gz
-%if %nosrc
-NoSource: 300
-%endif
-Source301: http://www.muhri.net/gkrellm/SolarE-2.gkrellm.tar.gz
+Source400: http://www.muhri.net/gkrellm/GKrellM-Skins.tar.gz
 %if %nosrc
-NoSource: 301
-%endif
-Source302: http://www.muhri.net/gkrellm/EJ.tar.gz
-%if %nosrc
-NoSource: 302
-%endif
-Source303: http://www.muhri.net/gkrellm/EMOZ.gkrellm.tar.gz
-%if %nosrc
-NoSource: 303
-%endif
-Source304: http://www.muhri.net/gkrellm/Jester.tar.gz
-%if %nosrc
-NoSource: 304
-%endif
-Source305: http://www.muhri.net/gkrellm/BloeSteel.tar.gz
-%if %nosrc
-NoSource: 305
-%endif
-Source306: http://www.muhri.net/gkrellm/BloeStolen.tar.gz
-%if %nosrc
-NoSource: 306
-%endif
-Source307: http://www.muhri.net/gkrellm/propaganda2a.tar.gz
-%if %nosrc
-NoSource: 307
-%endif
-Source308: http://www.muhri.net/gkrellm/propaganda2b.tar.gz
-%if %nosrc
-NoSource: 308
-%endif
-Source309: http://www.muhri.net/gkrellm/get-E-blue.gkrellm.tar.gz
-%if %nosrc
-NoSource: 309
-%endif
-Source310: http://www.muhri.net/gkrellm/OSX.tar.gz
-%if %nosrc
-NoSource: 310
-%endif
-Source311: http://www.muhri.net/gkrellm/GTK.tar.gz
-%if %nosrc
-NoSource: 311
-%endif
-Source312: http://www.muhri.net/gkrellm/sunset.gkrellm.tar.gz
-%if %nosrc
-NoSource: 312
-%endif
-Source313: http://www.muhri.net/gkrellm/E-Tech_GkrellM.tar.gz
-%if %nosrc
-NoSource: 313
-%endif
-Source314: http://www.muhri.net/gkrellm/E-Tech_XSlate_GKrellM.tar.gz
-%if %nosrc
-NoSource: 314
-%endif
-Source315: http://www.muhri.net/gkrellm/ReGet-E.tar.gz
-%if %nosrc
-NoSource: 315
-%endif
-Source316: http://www.muhri.net/gkrellm/IReX.tar.gz
-%if %nosrc
-NoSource: 316
-%endif
-Source317: http://www.muhri.net/gkrellm/BlueCyrus.tar.gz
-%if %nosrc
-NoSource: 317
-%endif
-Source318: http://www.muhri.net/gkrellm/cousin_2_c2h8.tar.gz
-%if %nosrc
-NoSource: 318
-%endif
-Source319: http://www.muhri.net/gkrellm/eMac.tar.gz
-%if %nosrc
-NoSource: 319
-%endif
-Source320: http://www.muhri.net/gkrellm/getE.gkrellm.tar.gz
-%if %nosrc
-NoSource: 320
-%endif
-Source321: http://www.muhri.net/gkrellm/getE2.gkrellm.tar.gz
-%if %nosrc
-NoSource: 321
-%endif
-Source322: http://www.muhri.net/gkrellm/Cyroid.tar.gz
-%if %nosrc
-NoSource: 322
-%endif
-Source323: http://www.muhri.net/gkrellm/TaoMetal.tar.gz
-%if %nosrc
-NoSource: 323
-%endif
-Source324: http://www.muhri.net/gkrellm/SuedE.tar.gz
-%if %nosrc
-NoSource: 324
-%endif
-Source325: http://www.muhri.net/gkrellm/gklcars.tar.gz
-%if %nosrc
-NoSource: 325
-%endif
-Source326: http://www.muhri.net/gkrellm/Led.tar.gz
-%if %nosrc
-NoSource: 326
-%endif
-Source327: http://www.muhri.net/gkrellm/brgnd-E.gkrellm.tar.gz
-%if %nosrc
-NoSource: 327
-%endif
-Source328: http://www.muhri.net/gkrellm/Absolute_E.tar.gz
-%if %nosrc
-NoSource: 328
-%endif
-Source329: http://www.muhri.net/gkrellm/cyrus2.tar.gz
-%if %nosrc
-NoSource: 329
-%endif
-Source330: http://www.muhri.net/gkrellm/spiffE.tar.gz
-%if %nosrc
-NoSource: 330
-%endif
-Source331: http://www.muhri.net/gkrellm/blueHeart_gkrellm.tar.gz
-%if %nosrc
-NoSource: 331
-%endif
-Source332: http://www.muhri.net/gkrellm/c2h8.gkrellm.tar.gz
-%if %nosrc
-NoSource: 332
-%endif
-Source333: http://www.muhri.net/gkrellm/Ganymede_gkrellm.tar.gz
-%if %nosrc
-NoSource: 333
-%endif
-Source334: http://www.muhri.net/gkrellm/Marble.tar.gz
-%if %nosrc
-NoSource: 334
-%endif
-Source335: http://www.muhri.net/gkrellm/Marble2.tar.gz
-%if %nosrc
-NoSource: 335
-%endif
-Source336: http://www.muhri.net/gkrellm/BrushedMetal-gkrellm.tar.gz
-%if %nosrc
-NoSource: 336
-%endif
-Source337: http://www.muhri.net/gkrellm/Photon.tar.gz
-%if %nosrc
-NoSource: 337
-%endif
-Source338: http://www.muhri.net/gkrellm/ShinyMetal.tar.gz
-%if %nosrc
-NoSource: 338
-%endif
-Source339: http://www.muhri.net/gkrellm/ShinyMetal2.tar.gz
-%if %nosrc
-NoSource: 339
-%endif
-Source340: http://www.muhri.net/gkrellm/concrete.tar.gz
-%if %nosrc
-NoSource: 340
-%endif
-Source341: http://www.muhri.net/gkrellm/sandymidnight.tar.gz
-%if %nosrc
-NoSource: 341
-%endif
-Source342: http://www.muhri.net/gkrellm/brnGradient.tar.gz
-%if %nosrc
-NoSource: 342
-%endif
-Source343: http://www.muhri.net/gkrellm/red.tar.gz
-%if %nosrc
-NoSource: 343
-%endif
-Source344: http://www.muhri.net/gkrellm/Cobalt.tar.gz
-%if %nosrc
-NoSource: 344
-%endif
-Source345: http://www.muhri.net/gkrellm/Brass.tar.gz
-%if %nosrc
-NoSource: 345
-%endif
-Source346: http://www.muhri.net/gkrellm/PurpHaze.tar.gz
-%if %nosrc
-NoSource: 346
-%endif
-Source347: http://www.muhri.net/gkrellm/bluesteel.tar.gz
-%if %nosrc
-NoSource: 347
-%endif
-Source348: http://www.muhri.net/gkrellm/arctic.tar.gz
-%if %nosrc
-NoSource: 348
-%endif
-Source349: http://www.muhri.net/gkrellm/SteelX.tar.gz
-%if %nosrc
-NoSource: 349
-%endif
-Source350: http://www.muhri.net/gkrellm/Steel.tar.gz
-%if %nosrc
-NoSource: 350
-%endif
-Source351: http://www.muhri.net/gkrellm/TruBlu2.tar.gz
-%if %nosrc
-NoSource: 351
-%endif
-Source352: http://www.muhri.net/gkrellm/trublu.tar.gz
-%if %nosrc
-NoSource: 352
-%endif
-Source353: http://www.muhri.net/gkrellm/coffee-cream.tar.gz
-%if %nosrc
-NoSource: 353
-%endif
-Source354: http://www.muhri.net/gkrellm/brushede16.tar.gz
-%if %nosrc
-NoSource: 354
-%endif
-Source355: http://www.muhri.net/gkrellm/3051.tar.gz
-%if %nosrc
-NoSource: 355
-%endif
-Source356: http://www.muhri.net/gkrellm/dark-smokey.tar.gz
-%if %nosrc
-NoSource: 356
-%endif
-Source357: http://www.muhri.net/gkrellm/aqua.tar.gz
-%if %nosrc
-NoSource: 357
-%endif
-Source358: http://www.muhri.net/gkrellm/amber2.tar.gz
-%if %nosrc
-NoSource: 358
-%endif
-Source359: http://www.muhri.net/gkrellm/brushed.tar.gz
-%if %nosrc
-NoSource: 359
-%endif
-Source360: http://www.muhri.net/gkrellm/blue.tar.gz
-%if %nosrc
-NoSource: 360
+NoSource: 400
 %endif
 
 Patch0: gkrellm-font.patch
-Patch100: gkrellm-gcc31.patch
+Patch1: gkrellm-plugins.patch
 
 URL: http://gkrellm.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk+1-devel imlib-devel net-snmp-devel
-#BuildRequires: net-snmp-devel
+BuildRequires: gtk+-devel
 BuildPrereq: xmms-devel
-Requires: gtk+1 imlib
+Requires: gtk+
 
 %description
 GKrellM is a single process stack of system monitors which supports
@@ -767,71 +102,61 @@
 %description xmms
 xmms plugin for GKrellM
 
-#%package snmp
-#Summary: snmp plugin for GKrellM
-#Group: Applications/System
-#Requires: %{name} = %{version}-%{release}
-#
-#%description snmp
-#snmp plugin for GKrellM
-
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .plugins
 
 mkdir plugins
 pushd plugins
-tar xzf %SOURCE100
-tar xzf %SOURCE101
 tar xzf %SOURCE102
 tar xzf %SOURCE103
-tar xzf %SOURCE104
 tar xzf %SOURCE106
-tar xzf %SOURCE107
-tar xzf %SOURCE108
 tar xzf %SOURCE109
 tar xzf %SOURCE110
 tar xzf %SOURCE111
-tar xzf %SOURCE112
-mkdir gkPCcard
-tar xzf %SOURCE113 -C gkPCcard
+tar xzf %SOURCE113
 %ifarch %{ix86}
 tar xzf %SOURCE114
 %endif
 tar xzf %SOURCE115
-tar xzf %SOURCE116
 tar xzf %SOURCE117
 tar xzf %SOURCE118
 tar xzf %SOURCE119
 tar xzf %SOURCE120
 tar xzf %SOURCE121
 tar xzf %SOURCE122
-#tar xzf %SOURCE123
+tar xzf %SOURCE124
 popd
 
-%patch100 -p1
+tar xzf %SOURCE400
 
 %build
-./enable_nls
-make CFLAGS="%{optflags}"
+make CFLAGS="%{optflags}" SYSTEM_PLUGINS_DIR=%{_datadir}/gkrellm2/plugins
 pushd plugins
 for j in */*.*
 do
   /usr/bin/perl -p -i -e 's|<gkrellm.h>|"../../src/gkrellm.h"|' $j
-  /usr/bin/perl -p -i -e 's|<gkrellm/gkrellm.h>|"../../src/gkrellm.h"|' $j
+  /usr/bin/perl -p -i -e 's|<gkrellm2/gkrellm.h>|"../../src/gkrellm.h"|' $j
+done
+for j in */*/*.*
+do
+  /usr/bin/perl -p -i -e 's|<gkrellm.h>|"../../../src/gkrellm.h"|' $j
+  /usr/bin/perl -p -i -e 's|<gkrellm2/gkrellm.h>|"../../../src/gkrellm.h"|' $j
 done
 
 for i in *
 do
   cd $i
-  if [ "$i" = "gkPCcard" ]; then
-    ./build_gkPCcard
-  elif [ -e build ]; then
+  if [ -e build ]; then
       ./build
-  elif [ -e gkrellm-bfm.c ]; then
-    make gkrellm
-  elif [ -e ibam-krell.cpp ]; then
-    make krell
+  elif [ -e gkrellflynn.c ]; then
+    make gkrellm2
+  elif [ -e src20/gkrellsun.c ]; then
+    pushd src20
+    make
+    cp gkrellsun.so ..
+    popd
   else
     make
   fi
@@ -841,185 +166,32 @@
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_prefix}/{bin,include}
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_includedir}
 make install \
-	INSTALLDIR=%{buildroot}%{_prefix}/bin \
-	INCLUDEDIR=%{buildroot}%{_prefix}/include \
+	INSTALLDIR=%{buildroot}%{_bindir} \
+	INCLUDEDIR=%{buildroot}%{_includedir} \
 	MANDIR=%{buildroot}%{_mandir}/man1 \
 	LOCALEDIR=%{buildroot}%{_datadir}/locale
 # Plugins
-mkdir -p %{buildroot}%{_datadir}/gkrellm/plugins
-cp plugins/*/*.so %{buildroot}%{_datadir}/gkrellm/plugins
+mkdir -p %{buildroot}%{_datadir}/gkrellm2/plugins
+cp plugins/*/*.so %{buildroot}%{_datadir}/gkrellm2/plugins
 
 # Themes
-mkdir -p %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE200 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE201 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE202 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE203 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE204 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE205 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE206 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE207 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE208 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE209 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE210 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE211 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE212 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE213 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE214 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE215 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE216 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE217 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE218 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE219 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE220 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE221 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE222 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE223 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE224 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE225 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE226 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE227 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE228 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE229 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE230 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE231 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE232 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE233 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE234 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE235 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE236 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE237 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE238 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE240 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE241 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE242 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE243 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE244 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE245 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE246 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE247 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE248 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE249 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE250 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE251 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE252 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE253 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE254 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE255 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE256 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE257 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE258 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE259 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE260 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE261 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE262 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE263 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE264 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE265 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE266 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE267 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE268 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE269 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE270 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE271 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE272 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE273 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE274 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE275 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE276 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE277 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE278 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE279 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE280 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE281 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE282 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE283 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE284 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE285 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE286 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE287 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE288 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE289 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE290 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE291 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE292 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE293 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE294 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE295 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE296 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE297 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE298 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE299 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE300 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE301 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE302 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE303 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE304 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE305 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE306 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE307 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE308 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE309 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE310 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE311 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE312 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE313 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE314 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE315 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE316 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE317 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE318 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE319 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE320 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE321 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE322 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE323 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE324 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE325 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE326 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE327 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE328 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE329 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE330 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE331 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE332 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE333 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE334 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE335 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE336 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE337 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE338 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE339 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE340 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE341 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE342 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE343 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE344 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE345 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE346 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE347 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE348 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE349 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE350 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE351 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE352 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE353 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE354 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE355 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE356 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE357 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE358 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE359 -C %{buildroot}%{_datadir}/gkrellm/themes
-tar xzf %SOURCE360 -C %{buildroot}%{_datadir}/gkrellm/themes
+mkdir -p %{buildroot}%{_datadir}/gkrellm2/themes
+pushd GKrellM-skins
+for i in *
+do
+  tar xzf $i -C %{buildroot}%{_datadir}/gkrellm2/themes
+done
+popd
 
 perl -p -i -e "s,\r,," \
-  %{buildroot}%{_datadir}/gkrellm/themes/Evolution/gkrellmrc
+  %{buildroot}%{_datadir}/gkrellm2/themes/Evolution/gkrellmrc
 perl -p -i -e "s,StyleChar ,StyleChart," \
-  %{buildroot}%{_datadir}/gkrellm/themes/HeliX-Sweetpill.gkrellm/gkrellmrc*
+  %{buildroot}%{_datadir}/gkrellm2/themes/HeliX-Sweetpill.gkrellm/gkrellmrc*
 perl -p -i -e "s,StylePane;,StylePanel," \
-  %{buildroot}%{_datadir}/gkrellm/themes/HeliX-Sweetpill.gkrellm/gkrellmrc*
+  %{buildroot}%{_datadir}/gkrellm2/themes/HeliX-Sweetpill.gkrellm/gkrellmrc*
 
 %clean
 rm -rf %{buildroot}
@@ -1027,44 +199,77 @@
 %files 
 %defattr(-,root,root)
 %doc COPYRIGHT Changelog* README Themes.html pixmaps/gkrellmrc
-%{_prefix}/bin/gkrellm
-%{_datadir}/gkrellm/plugins/aflag_anim.so
-%{_datadir}/gkrellm/plugins/earth_anim.so
-%{_datadir}/gkrellm/plugins/gkPCcard.so
-%{_datadir}/gkrellm/plugins/gkmouse.so
-%{_datadir}/gkrellm/plugins/gkrellaclock.so
-%{_datadir}/gkrellm/plugins/gkrellflynn.so
-%{_datadir}/gkrellm/plugins/gkrellkam.so
-%{_datadir}/gkrellm/plugins/gkrellmPing.so
-%{_datadir}/gkrellm/plugins/gkrellm_itime.so
-%{_datadir}/gkrellm/plugins/gkrellmlaunch.so
-%{_datadir}/gkrellm/plugins/gkrellmoon.so
-%{_datadir}/gkrellm/plugins/gkrellmwho.so
-%{_datadir}/gkrellm/plugins/gkrellshoot.so
-%{_datadir}/gkrellm/plugins/gkrellstock.so
-%{_datadir}/gkrellm/plugins/gkrellsun.so
+%{_bindir}/gkrellm
+%{_bindir}/gkrellmd
+%{_datadir}/gkrellm2/plugins/gkPCcard.so
+%{_datadir}/gkrellm2/plugins/gkleds.so
+%{_datadir}/gkrellm2/plugins/gkrellaclock.so
+%{_datadir}/gkrellm2/plugins/gkrellflynn.so
+%{_datadir}/gkrellm2/plugins/gkrellkam2.so
+%{_datadir}/gkrellm2/plugins/gkrellm_itime.so
+%{_datadir}/gkrellm2/plugins/gkrellmlaunch.so
+%{_datadir}/gkrellm2/plugins/gkrellmoon.so
+%{_datadir}/gkrellm2/plugins/gkrellshoot.so
+%{_datadir}/gkrellm2/plugins/gkrellstock.so
+%{_datadir}/gkrellm2/plugins/gkrellsun.so
 %ifarch %{ix86}
-%{_datadir}/gkrellm/plugins/gkx86info.so
+%{_datadir}/gkrellm2/plugins/gkx86info.so
 %endif
-%{_datadir}/gkrellm/plugins/ibam-krell.so
-%{_datadir}/gkrellm/plugins/reminder.so
-%{_datadir}/gkrellm/plugins/taskman.so
-%{_datadir}/gkrellm/plugins/volume.so
-%{_datadir}/gkrellm/plugins/wireless.so
-%{_datadir}/gkrellm/themes/*
-%{_prefix}/include/*
+%{_datadir}/gkrellm2/plugins/reminder.so
+%{_datadir}/gkrellm2/plugins/volume.so
+%{_datadir}/gkrellm2/plugins/wireless.so
+%{_datadir}/gkrellm2/themes/*
+%{_includedir}/*
 %{_datadir}/locale/*/LC_MESSAGES/gkrellm.mo
 %{_mandir}/man1/*.1*
 
 %files xmms
 %defattr(-,root,root)
-%{_datadir}/gkrellm/plugins/gkrellmms.so
-
-#%files snmp
-#%defattr(-,root,root)
-#%{_datadir}/gkrellm/plugins/gkrellm_snmp.so
+%{_datadir}/gkrellm2/plugins/gkrellmms.so
 
 %changelog
+* Thu Jan 30 2003 Yonekawa Susumu <yone@xxxxxxxxxxxxx>
+- (2.1.7-1m)
+- update to 2.1.7
+- update GkrellMItime     to 1.0
+- update GKrellKam        to 2.0.0
+- update gkrellmoon       to 0.6
+- update GKrellAclock     to 0.3.2
+- update GKrellStock      to 0.5
+- update GKrellShoot      to 0.4.1
+- update gkPCcard         to 1.0pre1
+- update Gkx86info for GKrellM2
+- update GKrellflynn      to 0.6
+- update GKrellM-Wireless to 2.0.2
+- update Volume           to 2.1.7
+- update GKrellMMS        to 2.1.6
+- update gkrellm-reminder to 2.0.0
+- update gkrellsun        to 0.9.1
+- update GKrellMLaunch    to 0.5
+- add gkleds 0.8.1
+- remove American Flag, Earth Anim
+- remove GKrellMouse
+- remove GK-Taskman
+- remove gkrellmPing
+- remove gkrellmwho
+- remove IBAM
+- remove SNMP
+- remove all themes and use tarball of all the skins on www.muhri.net
+- fix gkrellm-font.patch for GKrellM 2.1.6
+- add system plugin directory patch
+- remove gcc-3.1 patch
+- system plugin directory, system theme directory were changed
+- gkPCcard has normal Makefile. remove ./build_gkPCcard
+- gkrellsun must be make in src20/
+- requires gtk+ instead gtk1+
+- remove imlib, net-snmp requires
+- remove ./enable_nls on build
+- add SYSTEM_PLUGINS_DIR on make command
+- GKrellflynn needs make gkrellm2
+- gkrellsun needs make on src20/ directory
+- add %{_bindir}/gkrellmd on %files
+- use %{_bindir}, %{_includedir} macro tag
+
 * Sat Nov  9 2002 YAMAZAKI Makoto <uomaster@xxxxxxxxx>
 - (1.2.13-2m)
 - add gcc-3.1 patch